Preliminary effort to add a full screen flash by japtar10101 · Pull Request #48 · nbekris/rass-engine

japtar10101 · 2026-06-21T01:25:10Z

Here's my preliminary, compiling effort to add in a full screen flash, using SpriteFader component. This adds a ScreenFlashSystem to allow global access to a SpriteFader instance.

Completely untested. I'm working on a new PR to actually test what I've added in, here, but wanted to keep the PR small for the time being.

…able levels.

…le in their clone-constructor.

…ight-weight already, anyway.

…d writing its values easier.

…urations.

japtar10101 · 2026-06-21T01:27:20Z


 	AudioSource::AudioSource(const AudioSource &other)
-		: Cloneable<Component, AudioSource>{}
+		: Cloneable<Component, AudioSource>{other}


Unrelated bug-fix on AudioSource copy constructor.

japtar10101 · 2026-06-21T01:27:32Z


 	MusicFader::MusicFader(const MusicFader &other)
-		: Cloneable<Component, MusicFader>{}
+		: Cloneable<Component, MusicFader>{other}


Unrelated bug-fix on MusicFader copy constructor.

japtar10101 · 2026-06-21T01:28:05Z

 class CheatSystem : public ICheatSystem {
 public:
-	CheatSystem(const std::initializer_list<std::string_view> &scenePaths);
+	CheatSystem(std::initializer_list<std::string_view> scenePaths);


Unrelated bug-fix on CheatSystem list constructor.

japtar10101 · 2026-06-21T01:28:33Z

 #include "Systems/Logging/ILoggingSystem.h"
 #include "Utils.h"

-using json = nlohmann::json;


Unrelated refactor of removing using from Stream

japtar10101 · 2026-06-21T01:29:39Z

 	virtual ~TweenCurve() = default;

+	template<class T>
+	void Set(float startValue, T begin, T end);


Defining set to allow re-using an existing TweenCurve instance to change its internal member values.

Copilot

Pull request overview

Adds initial infrastructure for a global full-screen flash effect by reusing the existing SpriteFader component and introducing a ScreenFlashSystem that locates and drives a dedicated ScreenFlash entity in scenes.

Changes:

Extends TweenCurve and SpriteFader to support curve-driven fades and programmatic triggering.
Introduces IScreenFlashSystem/ScreenFlashSystem and registers it in GameRass/Main.cpp.
Adds a ScreenFlash entity asset and wires it into multiple scenes.

Reviewed changes

Copilot reviewed 22 out of 23 changed files in this pull request and generated 6 comments.

Show a summary per file

File	Description
Source/TweenCurve.h	Adds curve setter helpers and query APIs used by fade logic.
Source/TweenCurve.cpp	Fixes keyframe search ordering and adds duration/ending-value helpers.
Source/Systems/Cheat/CheatSystem.h	Adjusts ctor signature for initializer_list handling.
Source/Systems/Cheat/CheatSystem.cpp	Matches ctor signature change in implementation.
Source/Stream.h	Removes `json` alias usage in header, uses fully-qualified `nlohmann::json`.
Source/Components/SpriteFader.h	Expands SpriteFader to support curve-based fades and a Show() API.
Source/Components/SpriteFader.cpp	Implements curve-driven fade behavior, caching, and auto-disable support.
Source/Components/MusicFader.cpp	Fixes clone/copy construction to copy base state.
Source/Components/AudioSource.cpp	Fixes clone/copy construction to copy base state.
Source/Component.h	Changes `SetEnabled` signature to virtual void.
GameRass/Systems/ScreenFlash/ScreenFlashSystem.h	Declares system that finds a SpriteFader for screen flashing.
GameRass/Systems/ScreenFlash/ScreenFlashSystem.cpp	Implements scene bind/unbind and Show() forwarding to SpriteFader.
GameRass/Systems/ScreenFlash/IScreenFlashSystem.h	Adds global system interface for triggering flashes.
GameRass/Main.cpp	Registers `ScreenFlashSystem` as a global system.
GameRass/Assets/Scenes/VerticalSlicePuzzle.json	Adds `ScreenFlash` entity to scene contents.
GameRass/Assets/Scenes/VerticalSlicePlat.json	Adds `ScreenFlash` entity to scene contents.
GameRass/Assets/Scenes/Level4Puzzle.json	Adds `ScreenFlash` entity to scene contents.
GameRass/Assets/Scenes/Level2Puzzle.json	Adds `ScreenFlash` entity to scene contents.
GameRass/Assets/Scenes/Level2Plat.json	Adds `ScreenFlash` entity to scene contents.
GameRass/Assets/Scenes/Level1Puzzle.json	Adds `ScreenFlash` entity to scene contents.
GameRass/Assets/Scenes/Level1Plat.json	Adds `ScreenFlash` entity to scene contents.
GameRass/Assets/Entities/ScreenFlash.json	Introduces the flash overlay entity with Sprite + SpriteFader setup.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

+	// Empty key frames
+	this->keyFrames.clear();
+	this->keyFrames.reserve(keyFrames.size());
+
+	// Populate it with the setter
+	std::for_each(begin, end, [this] (const KeyFrame &key) {
+		this->keyFrames.emplace_back(key);
+	});


+float TweenCurve::GetTotalDuration() const {
+	// Check if there are any keyframes
+	float toReturn = 0.0f;
+	if(keyFrames.size() == 0) {
+		// If not, return 0
+		return toReturn;
+	}
+
+	// Sum the times of all keyframes
+	for(const KeyFrame &key : keyFrames) {
+		toReturn += key.time;
+	}
+	return toReturn;
+}


+	inline virtual void SetEnabled(bool flag) {
+		isEnabled = flag;
 	}


+// Author(s):    main Steven Yacoub, secondary Taro Omiya, Niko Bekris
+// Course:       GAM541
+// Project:      RASS
+// Purpose:      System providing custom memory allocation.


+	onSceneLoaded{this, &ScreenFlashSystem::OnSceneLoaded}
+	, onSceneUnloaded{this, &ScreenFlashSystem::OnSceneUnloaded} {}
+
+ScreenFlashSystem::~ScreenFlashSystem() {}


+void ScreenFlashSystem::Shutdown() {
+	if(!IGlobalEventsSystem::Get()) {
+		LOG_ERROR("{}: failed to initialize: no global events system", NameClass());
+		return;
+	}
+
+	// Unbind to scene load/unload events
+	IGlobalEventsSystem::Get()->unbind(SceneChange::AfterInitialize, &onSceneLoaded);
+	IGlobalEventsSystem::Get()->unbind(SceneChange::BeforeShutdown, &onSceneUnloaded);
+}


japtar10101 added 16 commits June 14, 2026 15:43

Working on setting up a ScreenFlash entity, and adding it to all play…

66fc55d

…able levels.

Fixing Components failing to copy over the isEnabled membe variab…

fbbca63

…le in their clone-constructor.

Making Component::SetEnabled(bool) virtual, and not return a variable.

88ec34d

Updating SpriteFader to respect the ::Enabled() flag on update.

79130ee

Adding SpriteFader to ScreenFlash.

309870c

Removing initializer list as const reference, since apparently it's l…

a2ce96e

…ight-weight already, anyway.

Adding a bunch of helper functions to TweenCurve to make reading an…

b3ec755

…d writing its values easier.

Updating SpriteFader to utilize TweenCurves to compute alpha.

e6e8869

Fixing runtime errors with TweenCurve traversing keyframes.

ccbf62e

Sorting the includes in SpriteFader

04224d3

Removing using from Stream.h

13f7026

Updating the TweenCurve::Set() method to allow more argument config…

8fbdec6

…urations.

Adding a SpriteFader::Show() method to make the sprite fader visible.

4cc1850

Adding stub code for screen flash system.

159d085

Binding the ScreenFlashSystem to the global events system.

724b9f5

Retrieving the screen flash from the scene.

19f4a4a

japtar10101 requested a review from nbekris June 21, 2026 01:25

japtar10101 self-assigned this Jun 21, 2026

japtar10101 requested review from Stevenyacoub and huboyuan2 June 21, 2026 01:25

japtar10101 commented Jun 21, 2026

View reviewed changes

huboyuan2 requested a review from Copilot June 23, 2026 23:49

Copilot started reviewing on behalf of huboyuan2 June 23, 2026 23:50 View session

Copilot AI reviewed Jun 23, 2026

View reviewed changes

huboyuan2 merged commit 19f4a4a into main Jul 11, 2026
1 check passed

japtar10101 deleted the taro/screen-flash branch July 16, 2026 23:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Preliminary effort to add a full screen flash - #48

Preliminary effort to add a full screen flash#48
huboyuan2 merged 16 commits into
mainfrom
taro/screen-flash

japtar10101 commented Jun 21, 2026 •

edited

Loading

Uh oh!

japtar10101 Jun 21, 2026

Uh oh!

japtar10101 Jun 21, 2026

Uh oh!

japtar10101 Jun 21, 2026

Uh oh!

japtar10101 Jun 21, 2026

Uh oh!

japtar10101 Jun 21, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

japtar10101 commented Jun 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

japtar10101 Jun 21, 2026

Choose a reason for hiding this comment

Uh oh!

japtar10101 Jun 21, 2026

Choose a reason for hiding this comment

Uh oh!

japtar10101 Jun 21, 2026

Choose a reason for hiding this comment

Uh oh!

japtar10101 Jun 21, 2026

Choose a reason for hiding this comment

Uh oh!

japtar10101 Jun 21, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

japtar10101 commented Jun 21, 2026 •

edited

Loading