birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code/Editor

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-09-10 20:15:16 -07:00
parent 8554cea0ad
commit 7f157f152d
39 changed files with 524 additions and 524 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/TrackView/SequenceBatchRenderDialog.h
+1 -1
View File
@@ -187,7 +187,7 @@ protected:
int m_customFPS;
void InitializeContext();
virtual void OnMovieEvent(IMovieListener::EMovieEvent event, IAnimSequence* pSequence);
void OnMovieEvent(IMovieListener::EMovieEvent event, IAnimSequence* pSequence) override;
void CaptureItemStart();
Code/Editor/TrackView/TrackViewCurveEditor.h
+5 -5
View File
@@ -50,8 +50,8 @@ public:
void SetPlayCallback(const std::function<void()>& callback);
// IAnimationContextListener
virtual void OnSequenceChanged(CTrackViewSequence* pNewSequence);
virtual void OnTimeChanged(float newTime);
void OnSequenceChanged(CTrackViewSequence* pNewSequence) override;
void OnTimeChanged(float newTime) override;
protected:
void showEvent(QShowEvent* event) override;
@@ -65,7 +65,7 @@ private:
void OnSplineTimeMarkerChange();
// IEditorNotifyListener
virtual void OnEditorNotifyEvent(EEditorNotifyEvent event) override;
void OnEditorNotifyEvent(EEditorNotifyEvent event) override;
//ITrackViewSequenceListener
void OnKeysChanged(CTrackViewSequence* pSequence) override;
@@ -109,8 +109,8 @@ public:
float GetFPS() const { return m_widget->GetFPS(); }
void SetTickDisplayMode(ETVTickMode mode) { m_widget->SetTickDisplayMode(mode); }
virtual void OnSequenceChanged(CTrackViewSequence* pNewSequence) { m_widget->OnSequenceChanged(pNewSequence); }
virtual void OnTimeChanged(float newTime) { m_widget->OnTimeChanged(newTime); }
void OnSequenceChanged(CTrackViewSequence* pNewSequence) override { m_widget->OnSequenceChanged(pNewSequence); }
void OnTimeChanged(float newTime) override { m_widget->OnTimeChanged(newTime); }
// ITrackViewSequenceListener delegation to m_widget
void OnKeysChanged(CTrackViewSequence* pSequence) override { m_widget->OnKeysChanged(pSequence); }
Code/Editor/TrackView/TrackViewDialog.h
+6 -6
View File
@@ -69,10 +69,10 @@ public:
void UpdateSequenceLockStatus();
// IAnimationContextListener
virtual void OnSequenceChanged(CTrackViewSequence* pNewSequence) override;
void OnSequenceChanged(CTrackViewSequence* pNewSequence) override;
// ITrackViewSequenceListener
virtual void OnSequenceSettingsChanged(CTrackViewSequence* pSequence) override;
void OnSequenceSettingsChanged(CTrackViewSequence* pSequence) override;
void UpdateDopeSheetTime(CTrackViewSequence* pSequence);
@@ -197,8 +197,8 @@ private:
bool processRawInput(MSG* pMsg);
#endif
virtual void OnNodeSelectionChanged(CTrackViewSequence* pSequence) override;
virtual void OnNodeRenamed(CTrackViewNode* pNode, const char* pOldName) override;
void OnNodeSelectionChanged(CTrackViewSequence* pSequence) override;
void OnNodeRenamed(CTrackViewNode* pNode, const char* pOldName) override;
void OnSequenceAdded(CTrackViewSequence* pSequence) override;
void OnSequenceRemoved(CTrackViewSequence* pSequence) override;
@@ -209,8 +209,8 @@ private:
void AddDialogListeners();
void RemoveDialogListeners();
virtual void BeginUndoTransaction();
virtual void EndUndoTransaction();
void BeginUndoTransaction() override;
void EndUndoTransaction() override;
void SaveCurrentSequenceToFBX();
void SaveSequenceTimingToXML();
Code/Editor/TrackView/TrackViewSequence.h
+16 -16
View File
@@ -100,16 +100,16 @@ public:
void Load() override;
// ITrackViewNode
virtual ETrackViewNodeType GetNodeType() const override { return eTVNT_Sequence; }
ETrackViewNodeType GetNodeType() const override { return eTVNT_Sequence; }
virtual AZStd::string GetName() const override { return m_pAnimSequence->GetName(); }
virtual bool SetName(const char* pName) override;
virtual bool CanBeRenamed() const override { return true; }
AZStd::string GetName() const override { return m_pAnimSequence->GetName(); }
bool SetName(const char* pName) override;
bool CanBeRenamed() const override { return true; }
// Binding/Unbinding
virtual void BindToEditorObjects() override;
virtual void UnBindFromEditorObjects() override;
virtual bool IsBoundToEditorObjects() const override;
void BindToEditorObjects() override;
void UnBindFromEditorObjects() override;
bool IsBoundToEditorObjects() const override;
// Time range
void SetTimeRange(Range timeRange);
@@ -136,10 +136,10 @@ public:
uint32 GetCryMovieId() const { return m_pAnimSequence->GetId(); }
// Rendering
virtual void Render(const SAnimContext& animContext) override;
void Render(const SAnimContext& animContext) override;
// Playback control
virtual void Animate(const SAnimContext& animContext) override;
void Animate(const SAnimContext& animContext) override;
void Resume() { m_pAnimSequence->Resume(); }
void Pause() { m_pAnimSequence->Pause(); }
void StillUpdate() { m_pAnimSequence->StillUpdate(); }
@@ -162,7 +162,7 @@ public:
void TimeChanged(float newTime) { m_pAnimSequence->TimeChanged(newTime); }
// Check if it's a group node
virtual bool IsGroupNode() const override { return true; }
bool IsGroupNode() const override { return true; }
// Track Events (TODO: Undo?)
int GetTrackEventsCount() const { return m_pAnimSequence->GetTrackEventsCount(); }
@@ -195,7 +195,7 @@ public:
bool IsActiveSequence() const;
// The root sequence node is always an active director
virtual bool IsActiveDirector() const override { return true; }
bool IsActiveDirector() const override { return true; }
// Copy keys to clipboard (in XML form)
void CopyKeysToClipboard(const bool bOnlySelectedKeys, const bool bOnlyFromSelectedTracks);
@@ -306,15 +306,15 @@ private:
// Called when an animation updates needs to be schedules
void ForceAnimation();
virtual void CopyKeysToClipboard(XmlNodeRef& xmlNode, const bool bOnlySelectedKeys, const bool bOnlyFromSelectedTracks) override;
void CopyKeysToClipboard(XmlNodeRef& xmlNode, const bool bOnlySelectedKeys, const bool bOnlyFromSelectedTracks) override;
std::deque<CTrackViewTrack*> GetMatchingTracks(CTrackViewAnimNode* pAnimNode, XmlNodeRef trackNode);
void GetMatchedPasteLocationsRec(std::vector<TMatchedTrackLocation>& locations, CTrackViewNode* pCurrentNode, XmlNodeRef clipboardNode);
virtual void BeginUndoTransaction();
virtual void EndUndoTransaction();
virtual void BeginRestoreTransaction();
virtual void EndRestoreTransaction();
void BeginUndoTransaction() override;
void EndUndoTransaction() override;
void BeginRestoreTransaction() override;
void EndRestoreTransaction() override;
// For record mode on AZ::Entities - connect (or disconnect) to buses for notification of property changes
void ConnectToBusesForRecording(const AZ::EntityId& entityIdForBus, bool enableConnection);
Code/Editor/TrackView/TrackViewSequenceManager.h
+2 -2
View File
@@ -27,7 +27,7 @@ public:
CTrackViewSequenceManager();
~CTrackViewSequenceManager();
virtual void OnEditorNotifyEvent(EEditorNotifyEvent event);
void OnEditorNotifyEvent(EEditorNotifyEvent event) override;
unsigned int GetCount() const { return static_cast<int>(m_sequences.size()); }
@@ -65,7 +65,7 @@ private:
void OnSequenceAdded(CTrackViewSequence* pSequence);
void OnSequenceRemoved(CTrackViewSequence* pSequence);
virtual void OnDataBaseItemEvent(IDataBaseItem* pItem, EDataBaseItemEvent event);
void OnDataBaseItemEvent(IDataBaseItem* pItem, EDataBaseItemEvent event) override;
// AZ::EntitySystemBus
void OnEntityNameChanged(const AZ::EntityId& entityId, const AZStd::string& name) override;
Code/Editor/TrackView/TrackViewSplineCtrl.h
+5 -5
View File
@@ -28,7 +28,7 @@ public:
CTrackViewSplineCtrl(QWidget* parent);
virtual ~CTrackViewSplineCtrl();
virtual void ClearSelection();
void ClearSelection() override;
void AddSpline(ISplineInterpolator* pSpline, CTrackViewTrack* pTrack, const QColor& color);
void AddSpline(ISplineInterpolator * pSpline, CTrackViewTrack * pTrack, QColor anColorArray[4]);
@@ -53,12 +53,12 @@ protected:
void wheelEvent(QWheelEvent* event) override;
private:
virtual void SelectKey(ISplineInterpolator* pSpline, int nKey, int nDimension, bool bSelect) override;
virtual void SelectRectangle(const QRect& rc, bool bSelect) override;
void SelectKey(ISplineInterpolator* pSpline, int nKey, int nDimension, bool bSelect) override;
void SelectRectangle(const QRect& rc, bool bSelect) override;
std::vector<CTrackViewTrack*> m_tracks;
virtual bool GetTangentHandlePts(QPoint& inTangentPt, QPoint& pt, QPoint& outTangentPt,
bool GetTangentHandlePts(QPoint& inTangentPt, QPoint& pt, QPoint& outTangentPt,
int nSpline, int nKey, int nDimension) override;
void ComputeIncomingTangentAndEaseTo(float& ds, float& easeTo, QPoint inTangentPt,
int nSpline, int nKey, int nDimension);
@@ -67,7 +67,7 @@ private:
void AdjustTCB(float d_tension, float d_continuity, float d_bias);
void MoveSelectedTangentHandleTo(const QPoint& point);
virtual ISplineCtrlUndo* CreateSplineCtrlUndoObject(std::vector<ISplineInterpolator*>& splineContainer);
virtual ISplineCtrlUndo* CreateSplineCtrlUndoObject(std::vector<ISplineInterpolator*>& splineContainer) override;
bool m_bKeysFreeze;
bool m_bTangentsFreeze;