Enabled glows showing on ALL MovableObjects #94
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Causeless
reviewed
Feb 18, 2024
Source/Entities/AEmitter.cpp
Outdated
| @@ -339,6 +339,7 @@ void AEmitter::SetFlash(Attachable* newFlash) { | |||
| m_pFlash->SetInheritsRotAngle(false); | |||
| m_pFlash->SetDeleteWhenRemovedFromParent(true); | |||
| m_pFlash->SetCollidesWithTerrainWhileAttached(false); | |||
| m_pFlash->MovableObject::SetEffectDrawEveryFrame(false); | |||
There was a problem hiding this comment.
please remove the manual disambiguation of MovableObject:: - this shouldn't be necessary.
Source/Entities/HDFirearm.cpp
Outdated
| @@ -407,6 +407,7 @@ void HDFirearm::SetFlash(Attachable* newFlash) { | |||
| m_pFlash->SetDrawnNormallyByParent(false); | |||
| m_pFlash->SetDeleteWhenRemovedFromParent(true); | |||
| m_pFlash->SetCollidesWithTerrainWhileAttached(false); | |||
| m_pFlash->MovableObject::SetEffectDrawEveryFrame(false); | |||
Source/Entities/MovableObject.h
Outdated
| @@ -1058,6 +1067,9 @@ namespace RTE { | |||
| /// @return Whether this MO has requested a synced update this frame. | |||
| virtual bool HasRequestedSyncedUpdate() { return m_RequestedSyncedUpdate; } | |||
|
|
|||
| /// Sets the screen effect to draw at the final post-processing stage. | |||
| void SetPostScreenEffectToDraw() const; | |||
There was a problem hiding this comment.
Probably this should be private
Source/Entities/MovableObject.cpp
Outdated
| @@ -893,6 +894,10 @@ void MovableObject::Update() { | |||
| if (m_RandomizeEffectRotAngleEveryFrame) { | |||
| m_EffectRotAngle = c_PI * 2.0F * RandomNormalNum(); | |||
| } | |||
|
|
|||
| if (m_pScreenEffect && m_EffectDrawEveryFrame) { | |||
| MovableObject::SetPostScreenEffectToDraw(); | |||
There was a problem hiding this comment.
As above, no disambiguation needed here
|
As comments above, and the stuff we talked about in Discord about renaming EffectDrawEveryFrame |
…a readable, changed default to false outside of pixels and particles
Causeless
reviewed
Feb 18, 2024
Source/Entities/MOSParticle.cpp
Outdated
| @@ -20,6 +20,7 @@ MOSParticle::~MOSParticle() { | |||
| void MOSParticle::Clear() { | |||
| m_Atom = nullptr; | |||
| m_SpriteAnimMode = OVERLIFETIME; | |||
| m_PostEffectEnabled = true; | |||
There was a problem hiding this comment.
please add a comment describing why this is being done (backwards compat reasons)
Causeless
reviewed
Feb 18, 2024
Source/Entities/MOPixel.cpp
Outdated
| @@ -24,6 +24,7 @@ void MOPixel::Clear() { | |||
| m_MaxLethalRange = 1; | |||
| m_LethalSharpness = 1; | |||
| m_Staininess = 0; | |||
| m_PostEffectEnabled = true; | |||
There was a problem hiding this comment.
please add a comment describing why this is being done (backwards compat reasons)
Causeless
requested changes
Feb 18, 2024
Source/Entities/MovableObject.h
Outdated
| @@ -12,6 +12,7 @@ | |||
| #include "LuabindObjectWrapper.h" | |||
| #include "Material.h" | |||
| #include "MovableMan.h" | |||
| #include "PostProcessMan.h" | |||
There was a problem hiding this comment.
Put this in the .cpp, not the header
Causeless
approved these changes
Feb 18, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I'm not sure why this wasn't already a thing but screen effects now show on all MO's to which they're attached, provided they're not obscured (or you set
EffectAlwaysShows = 1).