diff options
20 files changed, 232 insertions, 417 deletions
diff --git a/src/Authoring/Client/Code/Core/Commands/CmdDataModel.cpp b/src/Authoring/Client/Code/Core/Commands/CmdDataModel.cpp index 47a44b51..104225f0 100644 --- a/src/Authoring/Client/Code/Core/Commands/CmdDataModel.cpp +++ b/src/Authoring/Client/Code/Core/Commands/CmdDataModel.cpp @@ -38,7 +38,7 @@ namespace qt3dsdm { void SApplicationState::Store(CDoc &inDoc) { - m_Dirty = inDoc.IsModified(); + m_Dirty = inDoc.isModified(); m_SelectedInstance = inDoc.GetSelectedInstance(); m_ActiveSlide = inDoc.GetActiveSlide(); m_ActiveLayer = inDoc.GetActiveLayer(); diff --git a/src/Authoring/Client/Code/Core/Commands/CmdStack.cpp b/src/Authoring/Client/Code/Core/Commands/CmdStack.cpp index 76f51126..a1c6e943 100644 --- a/src/Authoring/Client/Code/Core/Commands/CmdStack.cpp +++ b/src/Authoring/Client/Code/Core/Commands/CmdStack.cpp @@ -132,7 +132,7 @@ bool CCmdStack::ExecuteCommand(CCmd *inCommand) void CCmdStack::Undo() { if (m_CommandStackModifier) { - if (m_CommandStackModifier->PreUndo() == false) + if (m_CommandStackModifier->preUndo() == false) return; } @@ -198,7 +198,7 @@ void CCmdStack::Redo() //============================================================================= bool CCmdStack::CanUndo() { - if (m_CommandStackModifier && m_CommandStackModifier->CanUndo()) + if (m_CommandStackModifier && m_CommandStackModifier->canUndo()) return true; return m_UndoList.size() > 0; } diff --git a/src/Authoring/Client/Code/Core/Commands/CmdStackModifier.h b/src/Authoring/Client/Code/Core/Commands/CmdStackModifier.h index 13f47bf9..c0829242 100644 --- a/src/Authoring/Client/Code/Core/Commands/CmdStackModifier.h +++ b/src/Authoring/Client/Code/Core/Commands/CmdStackModifier.h @@ -35,8 +35,8 @@ class ICmdStackModifier protected: virtual ~ICmdStackModifier() {} public: - virtual bool CanUndo() = 0; + virtual bool canUndo() = 0; // false means kill the undo without actually undoing anything - virtual bool PreUndo() = 0; + virtual bool preUndo() = 0; }; #endif
\ No newline at end of file diff --git a/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp b/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp index 3e1f16c0..7d39ab97 100644 --- a/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp +++ b/src/Authoring/Client/Code/Core/Doc/ClientDataModelBridge/ClientDataModelBridge.cpp @@ -1592,10 +1592,10 @@ bool CClientDataModelBridge::CanDelete(qt3dsdm::Qt3DSDMInstanceHandle inInstance case OBJTYPE_SUBPATH: case OBJTYPE_EFFECT: return !IsLockedAtAll(inInstance); - break; + case OBJTYPE_COMPONENT: return !IsLockedAtAll(inInstance) && !IsActiveComponent(inInstance); - break; + case OBJTYPE_LAYER: // We could not delete a layer if // 1. if the deleted layer is in master slide, and there is only 1 master layer @@ -1617,18 +1617,17 @@ bool CClientDataModelBridge::CanDelete(qt3dsdm::Qt3DSDMInstanceHandle inInstance } return !IsLockedAtAll(inInstance); - break; + case OBJTYPE_BEHAVIOR: return true; - break; + case OBJTYPE_MATERIAL: case OBJTYPE_LIGHTMAPS: case OBJTYPE_SCENE: return false; - break; + default: return false; - break; } } diff --git a/src/Authoring/Client/Code/Core/Doc/Doc.cpp b/src/Authoring/Client/Code/Core/Doc/Doc.cpp index a8000182..7d668d38 100644 --- a/src/Authoring/Client/Code/Core/Doc/Doc.cpp +++ b/src/Authoring/Client/Code/Core/Doc/Doc.cpp @@ -27,7 +27,6 @@ ** ****************************************************************************/ -#include "Qt3DSCommonPrecompile.h" #include "Doc.h" #include "Core.h" #include "Qt3DSDMStudioSystem.h" @@ -40,8 +39,6 @@ #include "FileOutputStream.h" #include "BufferedInputStream.h" #include "BufferedOutputStream.h" -#include "FormattedInputStream.h" -#include "FormattedOutputStream.h" #include "DataModelObjectReferenceHelper.h" #include "MasterP.h" #include "Dispatch.h" @@ -55,13 +52,11 @@ #include "CmdDataModelDeleteInstance.h" #include "PlaybackClock.h" #include "ColorConversion.h" -#include "WGLRenderContext.h" #include "IDocumentEditor.h" #include "IDocumentBufferCache.h" #include "StudioCoreSystem.h" #include "Qt3DSDMXML.h" #include "foundation/IOStreams.h" -#include "Qt3DSDMWStrOpsImpl.h" #include "IComposerSerializer.h" #include "Qt3DSFileTools.h" #include "ProjectSettingsSerializer.h" @@ -72,26 +67,15 @@ #include "Qt3DSTextRenderer.h" #include "SelectedValueImpl.h" #include "Qt3DSRenderPathManager.h" -#include "Studio/Application/DataInputDlg.h" -#include "EASTL/sort.h" -#include "foundation/Qt3DSLogging.h" -#include "Studio/Application/StudioApp.h" +#include "StudioApp.h" #include "Dialogs.h" #include <QtCore/qfileinfo.h> -#include <QtWidgets/qaction.h> -#include <QtWidgets/qwidget.h> #include <QtCore/qtimer.h> #include <QtGui/qvalidator.h> -using std::ref; -using std::shared_ptr; - -//============================================================================== -// Constants -//============================================================================== -const long STUDIO_FILE_VERSION = 6; -const long STUDIO_LAST_SUPPORTED_FILE_VERSION = 1; +const long UIP_VERSION = 6; // current version (latest supported) +const long LAST_SUPPORTED_UIP_VERSION = 1; IMPLEMENT_OBJECT_COUNTER(CDoc) @@ -139,10 +123,6 @@ struct SDocTransactionCommand : public CCmd QString ToString() override { return m_CommandName; } }; -//============================================================================== -/** - * Constructor - */ CDoc::CDoc(CCore *inCore) : m_PlayMode(PLAYMODE_STOP) , m_CurrentViewTime(0) @@ -157,7 +137,6 @@ CDoc::CDoc(CCore *inCore) , m_AssetGraph(TAssetGraphPtr()) , m_TransactionDepth(0) , m_nudging(false) - , m_RenderContext(nullptr) , m_WindowHandle(nullptr) { ADDTO_OBJECT_COUNTER(CDoc) @@ -169,10 +148,6 @@ CDoc::CDoc(CCore *inCore) m_Core = inCore; } -//============================================================================== -/** -* Destructor -*/ CDoc::~CDoc() { REMOVEFROM_OBJECT_COUNTER(CDoc) @@ -180,7 +155,6 @@ CDoc::~CDoc() m_SelectedObject = Q3DStudio::SSelectedValue(); // because on shutdown, the selected object ptr // cannot be assumed to be valid. CleanupData(); - ClosePresentation(); if (m_SceneInstance.Valid()) { @@ -195,7 +169,6 @@ CDoc::~CDoc() delete m_PlaybackClock; } -//============================================================================= /** * Set the state of this document as being modified or not. * This should affect the closing/saving of the core. @@ -210,17 +183,12 @@ void CDoc::SetKeyframesManager(IKeyframesManager *inManager) m_KeyframesManager = inManager; } -IKeyframesManager *CDoc::GetKeyframesManager() -{ - return m_KeyframesManager; -} - -qt3dsdm::IAnimationCore *CDoc::GetAnimationCore() +qt3dsdm::IAnimationCore *CDoc::GetAnimationCore() const { return GetStudioSystem()->GetAnimationCore(); } -qt3dsdm::IPropertySystem *CDoc::GetPropertySystem() +qt3dsdm::IPropertySystem *CDoc::GetPropertySystem() const { return GetStudioSystem()->GetPropertySystem(); } @@ -236,9 +204,8 @@ void CDoc::SetInstancePropertyValue(qt3dsdm::Qt3DSDMInstanceHandle inInstance, thePropertySystem->SetInstancePropertyValue(inInstance, theProperty, inValue); } -// Utility that either adds or removes control string for the specified -// property. Does not check if the property already has a controller -// in the controlledPropStr. Returns true on success. +// Utility that either adds or removes control string for the specified property. Does not check if +// the property already has a controller in the controlledPropStr. Returns true on success. bool ModifyControlStrForProperty(Q3DStudio::CString &controlledPropStr, const Q3DStudio::CString &propName, bool controlled = false, @@ -278,6 +245,7 @@ bool ModifyControlStrForProperty(Q3DStudio::CString &controlledPropStr, cpStr.append(propName); } controlledPropStr = cpStr; + return true; } @@ -290,7 +258,7 @@ void CDoc::RemoveDatainputBindings( const auto uniqueKeys = map->uniqueKeys(); for (const auto &name : uniqueKeys) { const auto values = map->values(name); - for (const auto pair : values) { + for (const auto &pair : values) { SetInstancePropertyControlled(pair.first, Q3DStudio::CString(), pair.second, Q3DStudio::CString::fromQString(name), false, true); @@ -298,10 +266,9 @@ void CDoc::RemoveDatainputBindings( } m_SceneEditor->EndAggregateOperation(); - // if SetInstancePropertyControlled fails for some reason, we might not - // have open transaction. - if (IsTransactionOpened()) - CloseTransaction(); + // if SetInstancePropertyControlled fails for some reason, we might not have open transaction. + if (isTransactionOpened()) + closeTransaction(); } // Set a property in an instance to be controlled by datainput. @@ -313,6 +280,8 @@ void CDoc::SetInstancePropertyControlled( qt3dsdm::Qt3DSDMPropertyHandle propName, Q3DStudio::CString newCtrl, bool controlled, bool batch) { + Q_UNUSED(instancepath) + qt3dsdm::IPropertySystem *thePropertySystem = GetStudioSystem()->GetPropertySystem(); // We might have invalid controller (not found from the global list of datainputs) bool newCtrlrValid = false; @@ -401,7 +370,7 @@ void CDoc::SetInstancePropertyControlled( Q3DStudio::ScopedDocumentEditor(*this, QObject::tr("Set controlled"), __FILE__, __LINE__) ->SetInstancePropertyValue(instance, ctrldElemPropHandle, controlledProperty); } else { - if (!IsTransactionOpened()) + if (!isTransactionOpened()) OpenTransaction(QObject::tr("Set multiple controlled"), __FILE__, __LINE__); SetInstancePropertyValue(instance, L"controlledproperty", controlledProperty); } @@ -448,7 +417,7 @@ Q3DStudio::IDocumentEditor &CDoc::OpenTransaction(const QString &inCmdName, cons return *m_SceneEditor; } -Q3DStudio::IDocumentEditor &CDoc::MaybeOpenTransaction(const QString &cmdName, +Q3DStudio::IDocumentEditor &CDoc::maybeOpenTransaction(const QString &cmdName, const char *inFile, int inLine) { if (!m_OpenTransaction) @@ -456,29 +425,29 @@ Q3DStudio::IDocumentEditor &CDoc::MaybeOpenTransaction(const QString &cmdName, return *m_SceneEditor; } -bool CDoc::IsTransactionOpened() const +bool CDoc::isTransactionOpened() const { - return m_OpenTransaction ? true : false; + return m_OpenTransaction != nullptr; } -void CDoc::RollbackTransaction() +void CDoc::rollbackTransaction() { if (m_OpenTransaction) m_OpenTransaction->DataModelRollback(); } -void CDoc::CloseTransaction() +void CDoc::closeTransaction() { if (m_TransactionDepth) { --m_TransactionDepth; if (m_TransactionDepth == 0) { assert(m_OpenTransaction); - IKnowWhatIAmDoingForceCloseTransaction(); + forceCloseTransaction(); } } } -void CDoc::IKnowWhatIAmDoingForceCloseTransaction() +void CDoc::forceCloseTransaction() { if (m_OpenTransaction) { qCInfo(qt3ds::TRACE_INFO) << "Closing transaction"; @@ -504,38 +473,37 @@ void CDoc::IKnowWhatIAmDoingForceCloseTransaction() m_TransactionDepth = 0; } -bool CDoc::CanUndo() +bool CDoc::canUndo() { - return (m_OpenTransaction != nullptr); + return m_OpenTransaction != nullptr; } -bool CDoc::PreUndo() +bool CDoc::preUndo() { if (m_OpenTransaction && m_OpenTransaction->HasTransactions()) { qCInfo(qt3ds::TRACE_INFO) << "PreUndo begin"; // In this case we want the command to absolutely immediately commit; we don't want it // to wait until a further post message else the previous command is the one that will get // undone. - IKnowWhatIAmDoingForceCloseTransaction(); + forceCloseTransaction(); qCInfo(qt3ds::TRACE_INFO) << "PreUndo end"; return true; } return false; } -/** - * Check to see if this document has been modified since the last save. - */ -bool CDoc::IsModified() + +// Is document modified since last save? +bool CDoc::isModified() const { return m_IsModified; } -bool CDoc::IsValid() const +bool CDoc::isValid() const { return !m_DocumentPath.isEmpty(); } -//============================================================================= + /** * Get the Asset from inSelectedItem, if exists */ @@ -570,7 +538,6 @@ CCore *CDoc::GetCore() const return m_Core; } -//============================================================================= /** * Calls NotifyActiveSlideChanged( qt3dsdm::Qt3DSDMSlideHandle inNewActiveSlide, bool *inForceRefresh ) @@ -611,7 +578,6 @@ void CDoc::SetActiveSlideChange(qt3dsdm::Qt3DSDMSlideHandle inNewActiveSlide) } } -//============================================================================= /** * Sets the active slide for the document. * The active slide is used for when something other than the Scene is @@ -701,11 +667,10 @@ void CDoc::NotifyActiveSlideChanged(qt3dsdm::Qt3DSDMSlideHandle inNewActiveSlide } } -//============================================================================= /** * @returns the first enabled layer in the active time context */ -qt3dsdm::Qt3DSDMInstanceHandle CDoc::GetFirstSelectableLayer() +qt3dsdm::Qt3DSDMInstanceHandle CDoc::getFirstSelectableLayer() { CClientDataModelBridge *theBridge = m_StudioSystem->GetClientDataModelBridge(); @@ -714,17 +679,14 @@ qt3dsdm::Qt3DSDMInstanceHandle CDoc::GetFirstSelectableLayer() theBridge->GetComponentActiveSlide(m_SceneInstance), theLayers, OBJTYPE_LAYER); - qt3dsdm::Qt3DSDMInstanceHandle theFoundLayer = 0; - for (; !theLayers.IsDone(); ++theLayers) { if (!theBridge->IsLockedAtAll(theLayers.GetCurrent()) && m_StudioSystem->IsInstance(theLayers.GetCurrent())) { - theFoundLayer = theLayers.GetCurrent(); - break; + return theLayers.GetCurrent(); } } - return theFoundLayer; + return 0; } // returns all instances that has a 'variants' property @@ -756,10 +718,10 @@ qt3dsdm::Qt3DSDMInstanceHandle CDoc::GetActiveRootInstance() return m_StudioSystem->GetClientDataModelBridge()->GetOwningComponentInstance( m_ActiveSlide); } + return m_SceneInstance; } -//============================================================================= /** * Returns the current active slide * The timeline is always displaying the active root. @@ -768,12 +730,13 @@ qt3dsdm::Qt3DSDMSlideHandle CDoc::GetActiveSlide() { if (m_ActiveSlide.Valid()) return m_ActiveSlide; + if (m_SceneInstance.Valid()) return m_StudioSystem->GetClientDataModelBridge()->GetComponentSlide(m_SceneInstance, 0); + return 0; } -//============================================================================= /** * Get the currently active layer. * The active layer is the layer of the last selected asset or the first enabled layer after @@ -782,12 +745,12 @@ qt3dsdm::Qt3DSDMSlideHandle CDoc::GetActiveSlide() */ qt3dsdm::Qt3DSDMInstanceHandle CDoc::GetActiveLayer() { - if (m_ActiveLayer.Valid() == false) - m_ActiveLayer = GetFirstSelectableLayer(); + if (!m_ActiveLayer.Valid()) + m_ActiveLayer = getFirstSelectableLayer(); + return m_ActiveLayer; } -//============================================================================= /** * Set the currently active layer. * The active layer is the layer of the last selected asset or the first enabled layer after @@ -799,7 +762,6 @@ void CDoc::SetActiveLayer(qt3dsdm::Qt3DSDMInstanceHandle inLayerInstance) m_ActiveLayer = inLayerInstance; } -//============================================================================= /** * Deselects all the items and keyframes that are currently selected. */ @@ -814,7 +776,6 @@ void CDoc::DeselectAllItems(bool inSendEvent) DeselectAllKeyframes(); } -//============================================================================= /** * Cuts the selected object */ @@ -897,11 +858,10 @@ void CDoc::PasteObjectMaster(qt3dsdm::Qt3DSDMInstanceHandle inInstance) } } -//============================================================================= /** * Deletes the selected object */ -void CDoc::DeleteSelectedObject(bool slide) +void CDoc::deleteSelectedObject(bool slide) { if (!slide) { qt3dsdm::TInstanceHandleList theSelectedHandles = m_SelectedValue.GetSelectedInstances(); @@ -922,10 +882,8 @@ void CDoc::DeleteSelectedObject(bool slide) void CDoc::DeleteObject(const qt3dsdm::TInstanceHandleList &inInstances) { - - // We don't deselect all items because that will happen - // automagically because we are listening to the events coming out - // of the system around delete. + // We don't deselect all items because that will happen automagically because we are listening + // to the events coming out of the system around delete. DeselectAllKeyframes(); CClientDataModelBridge *theClientBridge = GetStudioSystem()->GetClientDataModelBridge(); @@ -937,24 +895,20 @@ void CDoc::DeleteObject(const qt3dsdm::TInstanceHandleList &inInstances) Q3DStudio::CString theListOfTargets; GetActionDependencies(inInstances[idx], theListOfTargets); - if (!theListOfTargets.IsEmpty()) { - if (m_DeletingReferencedObjectHandler) { - m_DeletingReferencedObjectHandler->DisplayMessageBox(theListOfTargets - .toQString()); - } - } + if (!theListOfTargets.IsEmpty() && m_DeletingReferencedObjectHandler) + m_DeletingReferencedObjectHandler->DisplayMessageBox(theListOfTargets.toQString()); deletableInstances.push_back(inInstances[idx]); } } - if (deletableInstances.empty() == false) { + if (!deletableInstances.empty()) { NotifySelectionChanged(); - Q3DStudio::SCOPED_DOCUMENT_EDITOR(*this, QObject::tr("Delete"))->DeleteInstances(deletableInstances); + Q3DStudio::SCOPED_DOCUMENT_EDITOR(*this, QObject::tr("Delete")) + ->DeleteInstances(deletableInstances); } } -//============================================================================= /** * Checks and return a string of objects that have actions referencing inAsset. * @inAsset The asset to check for dependencies. @@ -998,7 +952,6 @@ void CDoc::GetActionDependencies(qt3dsdm::Qt3DSDMInstanceHandle inInstance, } } -//============================================================================= /** * Checks and return a string of objects that have actions referencing inAsset. * @inAsset The asset to check for dependencies. @@ -1018,24 +971,17 @@ void CDoc::GetActionDependencies(qt3dsdm::Qt3DSDMInstanceHandle inInstance, } } -//============================================================================= /** * Deletes the selected items, this is the primary handler of the delete key. */ void CDoc::DeleteSelectedItems(bool slide) { - // If there are keyframes selected, delete them - if (!DeleteSelectedKeys()) { - // If there are no keyframes selected, delete whatever asset is selected - DeleteSelectedObject(slide); - } + // If there are keyframes selected, delete them, else delete whatever asset is selected + if (!deleteSelectedKeyframes()) + deleteSelectedObject(slide); } -//============================================================================= -/** - * Only deletes keyframes, this is useful for when you don't wanna chekc objects - */ -bool CDoc::DeleteSelectedKeys() +bool CDoc::deleteSelectedKeyframes() { if (m_KeyframesManager) return m_KeyframesManager->RemoveKeyframes(false); @@ -1043,7 +989,6 @@ bool CDoc::DeleteSelectedKeys() return false; } -//============================================================================= /** * Sets keyframes on all the changed properties of the selected object. */ @@ -1086,7 +1031,7 @@ bool CDoc::SetSelection(Q3DStudio::SSelectedValue inNewSelection) theActiveLayer = 0; if (!theActiveLayer.Valid()) - theActiveLayer = GetFirstSelectableLayer(); + theActiveLayer = getFirstSelectableLayer(); if (theActiveLayer.Valid() && theBridge->IsLockedAtAll(theActiveLayer)) theActiveLayer = 0; @@ -1097,6 +1042,7 @@ bool CDoc::SetSelection(Q3DStudio::SSelectedValue inNewSelection) return true; } + return false; } @@ -1134,9 +1080,11 @@ void CDoc::SetActiveSlideWithTransaction(qt3dsdm::Qt3DSDMSlideHandle inNewActive Qt3DSDMSlideHandle theActiveSlide = m_ActiveSlide; m_ActiveSlide = inNewActiveSlide; TTransactionConsumerPtr theConsumer = m_StudioSystem->GetFullSystem()->GetConsumer(); - if (theConsumer) + if (theConsumer) { theConsumer->OnTransaction(std::make_shared<SReferenceTransaction<Qt3DSDMSlideHandle>>( - __FILE__, __LINE__, ref(m_ActiveSlide), theActiveSlide, inNewActiveSlide)); + __FILE__, __LINE__, std::ref(m_ActiveSlide), theActiveSlide, + inNewActiveSlide)); + } } void CDoc::SetSceneGraph(std::shared_ptr<Q3DStudio::IDocSceneGraph> inGraph) @@ -1364,7 +1312,6 @@ Q3DStudio::SSelectedValue CDoc::SetupInstanceSelection(qt3dsdm::Qt3DSDMInstanceH return Q3DStudio::SSelectedValue(); } -//============================================================================== /** * Select DataModel Object given its instance handle. * @param inInstanceHandle The instance handle of the DataModel Object to be selected @@ -1406,7 +1353,7 @@ void CDoc::ToggleDataModelObjectToSelection(qt3dsdm::Qt3DSDMInstanceHandle inIns void CDoc::SelectAndNavigateToDataModelObject(qt3dsdm::Qt3DSDMInstanceHandle inInstanceHandle) { - if (inInstanceHandle.Valid() == false) { + if (!inInstanceHandle.Valid()) { QT3DS_ASSERT(false); return; } @@ -1424,7 +1371,6 @@ void CDoc::SelectAndNavigateToDataModelObject(qt3dsdm::Qt3DSDMInstanceHandle inI NotifySelectionChanged(SetupInstanceSelection(inInstanceHandle)); } -//============================================================================= /** * Get the latest end time of the children of the Active Root. */ @@ -1457,7 +1403,7 @@ void CDoc::OnComponentSeconds() m_Core->GetDispatch()->FireOnTimeChanged(m_CurrentViewTime); } -//============================================================================== + /** * Tell Client that the time has changed and update views accordingly. * Set the current time on the current time context to be inNewTime. @@ -1491,7 +1437,6 @@ void CDoc::DoNotifyTimeChanged(long inNewTime) m_StudioSystem->GetSlideSystem()->SetComponentSeconds(theMasterSlide, (float)inNewTime / 1000); } -//============================================================================== /** * Sets the timebar time range of the currently selected object in the timeline * @param inSetStart true to set the Start time, false sets the End time @@ -1503,13 +1448,13 @@ void CDoc::TruncateTimebar(bool inSetStart, bool inAffectsChildren) qt3dsdm::Qt3DSDMInstanceHandle theSelectedInstance = GetSelectedInstance(); // Cannot change the time bars for a material - if (theSelectedInstance.Valid()) + if (theSelectedInstance.Valid()) { Q3DStudio::ScopedDocumentEditor(*this, QObject::tr("Truncate Time Range"), __FILE__, __LINE__) ->TruncateTimeRange(theSelectedInstance, inSetStart, GetCurrentViewTime()); + } } -//============================================================================== /** * Tell Client to be in either PLAY or PAUSE mode. * This potentially changes the current mode of the Client, whether it should @@ -1519,15 +1464,13 @@ void CDoc::TruncateTimebar(bool inSetStart, bool inAffectsChildren) */ void CDoc::SetPlayMode(EPlayMode inPlayMode, long inRestoreTime /*= -1*/) { - if (m_PlayMode != inPlayMode) // if there is a change + if (m_PlayMode != inPlayMode) { m_PlayMode = inPlayMode; - // Play or stop? if (inPlayMode == PLAYMODE_PLAY) { // Set Client to PLAY m_PlaybackClock->StartPlayback(); - m_Core->GetDispatch()->FireOnPlayStart(); } else { // Set Client to STOP @@ -1539,17 +1482,15 @@ void CDoc::SetPlayMode(EPlayMode inPlayMode, long inRestoreTime /*= -1*/) } } -//============================================================================= /** * Determine if Studio is playing the presentation. * @return true if Studio is currently in play mode */ bool CDoc::IsPlaying() { - return (m_PlayMode == PLAYMODE_PLAY); + return m_PlayMode == PLAYMODE_PLAY; } -//============================================================================== /** * Returns the time Client believes it to be. * This requests the current time from Client. This allows in-place previewing @@ -1563,7 +1504,6 @@ long CDoc::GetCurrentClientTime() return 0; } -//============================================================================== /** * Get the current visible time. * This differs by the current client time in that you can move the playhead @@ -1609,7 +1549,6 @@ bool CDoc::SetDocumentPath(const QString &inDocumentPath) return true; } -//============================================================================= /** * Create Untitled document in user directory */ @@ -1686,7 +1625,6 @@ Q3DStudio::CString CDoc::GetDocumentDirectory() const return thePath.GetDirectory(); } -//============================================================================= /** * Given an absolute path, return the relative path to doc if it is in doc's subdirectory. * Else, return normalized path so that we can easily do string comparison to compare path. @@ -1703,7 +1641,6 @@ Q3DStudio::CString CDoc::GetRelativePathToDoc(const Q3DStudio::CFilePath &inPath return thePath; } -//============================================================================= /** * Given a path (may be relative or absolute), return the path with respect to doc. * If the path is relative, it will be resolved based on document path. @@ -1722,7 +1659,6 @@ Q3DStudio::CString CDoc::GetResolvedPathToDoc(const Q3DStudio::CFilePath &inPath return inPath.toCString(); } -//============================================================================= /** * Close the current document. * This will remove all the items from the scene, perform all the cleanup. @@ -1735,19 +1671,15 @@ void CDoc::CloseDocument() DeselectAllItems(); m_SceneEditor.reset(); - if (m_DocumentBufferCache) { - // Ensure old buffers aren't picked up for the same relative path. + if (m_DocumentBufferCache) // Ensure old buffers aren't picked up for the same relative path. m_DocumentBufferCache->Clear(); - } CDispatchDataModelNotificationScope __dispatchScope(*GetCore()->GetDispatch()); SetPlayMode(PLAYMODE_STOP); m_Core->GetDispatch()->FireOnClosingPresentation(); - // clean up all studio data - CleanupData(); - + CleanupData(); // clean up all studio data ClosePresentation(); if (m_SceneInstance.Valid()) { @@ -1762,13 +1694,12 @@ void CDoc::CloseDocument() SetModifiedFlag(false); } -//============================================================================= /** * Called when the core opens a UIP file. */ void CDoc::LoadDocument(const QString &inDocument) { - ResetData(); + ResetDataCore(); CFileInputStream theFileStream(inDocument); CBufferedInputStream theBufferedStream(&theFileStream, QFileInfo(inDocument).size()); @@ -1777,10 +1708,6 @@ void CDoc::LoadDocument(const QString &inDocument) LoadPresentationFile(&theBufferedStream); } -//============================================================================= -/** - * Save Document - */ void CDoc::SaveDocument(const QString &inDocument) { // Remove unused materials from the container during saving so that the .uip is not cluttered @@ -1798,7 +1725,6 @@ void CDoc::SaveDocument(const QString &inDocument) updatableEditor.RollbackEditor(); } -//============================================================================= /** * This will create and load a new document with all the default resources. * This should only be called on an empty document (after CloseDocument) and @@ -1810,7 +1736,7 @@ void CDoc::CreateNewDocument() using namespace Q3DStudio; CDispatchDataModelNotificationScope __dispatchScope(*m_Core->GetDispatch()); - ResetData(); + ResetDataCore(); CreatePresentation(); @@ -1841,7 +1767,6 @@ void CDoc::CreateNewDocument() SetModifiedFlag(false); } -//============================================================================= /** * Create a new presentation within Client. */ @@ -1850,7 +1775,8 @@ void CDoc::CreatePresentation() // m_SceneInstance should be invalid ASSERT(!m_SceneInstance.Valid()); - // eclee TODO: Move these to ComponentFactory + // TODO: Move these to ComponentFactory + // Create the top-level scene object Q3DStudio::CId theSceneId(SCENE_GUID); @@ -1867,7 +1793,6 @@ void CDoc::ClosePresentation() OnPresentationDeactivated(); } -//============================================================================== /** * Step the client (this is really overridding update in client) */ @@ -1876,7 +1801,6 @@ void CDoc::ClientStep() m_PlaybackClock->UpdateTime(); } -//============================================================================= /** * Removes all StudioObjects from the Map * This cleans up all of the CStudioObjects that Studio owns. @@ -1894,15 +1818,6 @@ void CDoc::CleanupData() } /** - * Called when we are preparing to load or create a new presentation. - */ -void CDoc::ResetData() -{ - ResetDataCore(); -} - -//============================================================================= -/** * Process a copy command. * This will copy Actions, Keyframes or objects, depending on what is selected. * If the Action Palette is visible, then this will do an Action copy. @@ -1910,18 +1825,17 @@ void CDoc::ResetData() */ void CDoc::HandleCopy() { - if (CanCopyAction()) { + if (canCopySelectedActions()) { ASSERT(0); // Dispatch ... and/or, what? // m_StudioApp->GetViews( )->GetActionControl( )->OnCopyAction( ); } else if (m_KeyframesManager && m_KeyframesManager->HasSelectedKeyframes()) { - if (CanCopyKeyframe()) + if (canCopySelectedKeyframes()) m_KeyframesManager->CopyKeyframes(); - } else if (CanCopyObject()) { + } else if (canCopySelectedObjects()) { CopyObject(m_SelectedValue.GetSelectedInstances()); } } -//============================================================================= /** * Process a paste command. * If there is an action on the clipboard, and the action palette is visible, @@ -1931,11 +1845,11 @@ void CDoc::HandleCopy() */ void CDoc::HandlePaste() { - if (CanPasteAction()) { + if (canPasteActions()) { ASSERT(0); // dispatch // m_StudioApp->GetViews( )->GetActionControl( )->OnPasteAction( ); // m_StudioApp->GetViews( )->OnShowAction( ); - } else if (CanPasteObject()) { + } else if (canPasteObjects()) { PasteObject(getPasteTarget(GetSelectedInstance())); } else { if (m_KeyframesManager) @@ -1943,7 +1857,6 @@ void CDoc::HandlePaste() } } -//============================================================================= /** * Process a paste command for Master Slide. * If there is an action on the clipboard, and the action palette is visible, @@ -1955,11 +1868,11 @@ void CDoc::HandleMasterPaste() { using namespace Q3DStudio; - if (CanPasteAction()) { + if (canPasteActions()) { ASSERT(0); // dispatch // m_StudioApp->GetViews( )->GetActionControl( )->OnPasteAction( ); // m_StudioApp->GetViews( )->OnShowAction( ); - } else if (CanPasteObject()) { + } else if (canPasteObjects()) { qt3dsdm::Qt3DSDMInstanceHandle theSelectedInstance = getPasteTarget(GetSelectedInstance()); long theTargetObjectType = GetStudioSystem()->GetClientDataModelBridge()->GetObjectType(theSelectedInstance); @@ -1990,7 +1903,6 @@ void CDoc::HandleMasterPaste() } } -//============================================================================= /** * Process a cut command. * This will copy/cut Action, if the Action Palette is visible, and an action @@ -2001,54 +1913,52 @@ void CDoc::HandleMasterPaste() */ void CDoc::HandleCut() { - // we only need to check if it can be copied. - // if it can be copied, then it can be cut. - if (CanCopyAction()) { + // we only need to check if it can be copied. If it can be copied, then it can be cut. + if (canCopySelectedActions()) { ASSERT(0); // dispatch // m_StudioApp->GetViews( )->GetActionControl( )->OnCutAction( ); } else if (m_KeyframesManager && m_KeyframesManager->HasSelectedKeyframes()) { m_KeyframesManager->CopyKeyframes(); m_KeyframesManager->RemoveKeyframes(true); - } else if (CanCopyObject()) { + } else if (canCopySelectedObjects()) { CutSelectedObject(); } } -bool CDoc::CanCopyObject(const qt3dsdm::TInstanceHandleList &inInstances) +bool CDoc::canCopyObjects(const qt3dsdm::TInstanceHandleList &inInstances) const { if (inInstances.empty()) return false; bool retval = true; - const qt3dsdm::TInstanceHandleList &theInstances = (inInstances); + const qt3dsdm::TInstanceHandleList &theInstances = inInstances; for (size_t idx = 0, end = theInstances.size(); idx < end && retval; ++idx) retval &= m_StudioSystem->GetClientDataModelBridge()->IsDuplicateable(theInstances[idx]); + return retval; } -//============================================================================== + /** - * Check to see if an object can be copied into the clipboard + * Check to see if selected object can be copied into the clipboard */ -bool CDoc::CanCopyObject() +bool CDoc::canCopySelectedObjects() const { - return CanCopyObject(m_SelectedValue.GetSelectedInstances()); + return canCopyObjects(m_SelectedValue.GetSelectedInstances()); } -//============================================================================== /** * Check to see if a keyframe can be copied into the clipboard */ -bool CDoc::CanCopyKeyframe() +bool CDoc::canCopySelectedKeyframes() const { - return (m_KeyframesManager) ? m_KeyframesManager->CanPerformKeyframeCopy() : false; + return m_KeyframesManager ? m_KeyframesManager->CanPerformKeyframeCopy() : false; } -//============================================================================== /** * Check to see if an Action can be copied onto the clipboard. * @return true if an Action can be copied onto the clipboard. */ -bool CDoc::CanCopyAction() +bool CDoc::canCopySelectedActions() const { bool theCanCopy = false; @@ -2064,32 +1974,29 @@ bool CDoc::CanCopyAction() return theCanCopy; } -//============================================================================== /** * Check to see if an object can be pasted into the Scene. */ -bool CDoc::CanPasteObject() const +bool CDoc::canPasteObjects() const { return getPasteTarget(GetSelectedInstance()).Valid(); } -//============================================================================== /** * Check to see if a keyframe can be pasted from the clipboard */ -bool CDoc::CanPasteKeyframe() +bool CDoc::canPasteKeyframes() const { - return (m_KeyframesManager) ? m_KeyframesManager->CanPerformKeyframePaste() : false; + return m_KeyframesManager ? m_KeyframesManager->CanPerformKeyframePaste() : false; } -//============================================================================== /** * Check to see if an action can be pasted from the clipboard. * Paste action is only allowed if there is an Action on the clipboard, an asset * is selected, and the Timeline is in focus. * @return true if we can paste an action. */ -bool CDoc::CanPasteAction() +bool CDoc::canPasteActions() const { bool theCanPaste = false; @@ -2109,58 +2016,45 @@ bool CDoc::CanPasteAction() return theCanPaste; } -//============================================================================== /** - * Check to see if an object or keyframe(s) can be copied into the clipboard + * Is there valid selected keyframe(s), object(s), or action(s) to be copied? */ -bool CDoc::CanCopy() +bool CDoc::canCopy() const { - return CanCopyKeyframe() || CanCopyObject() || CanCopyAction(); + return canCopySelectedKeyframes() || canCopySelectedObjects() || canCopySelectedActions(); } -//============================================================================== /** * Check to see if an object or keyframe(s) can be pasted into the Scene. */ -bool CDoc::CanPaste() +bool CDoc::canPaste() const { - return CanPasteKeyframe() || CanPasteObject() || CanPasteAction(); + return canPasteKeyframes() || canPasteObjects() || canPasteActions(); } -//============================================================================== /** * Check to see if an object or keyframe(s) can be cut. */ -bool CDoc::CanCut() -{ - bool theReturn = false; - - if (CanCopy()) { - if (CanCopyAction()) { - // If you can copy an Action, you jolly well can delete it. - // ie. An action is currently selected, and the ActionControl (aka Action Palette) is in - // focus. - theReturn = true; - } else if (CanCopyObject()) { - // Check the Object is not the scene - // the Object cannot be the last layer as well - qt3dsdm::TInstanceHandleList theInstances = m_SelectedValue.GetSelectedInstances(); - bool canDelete = !theInstances.empty(); - for (size_t idx = 0, end = theInstances.size() && canDelete; idx < end; ++idx) { - canDelete = GetDocumentReader().IsInstance(theInstances[idx]) - && GetStudioSystem()->GetClientDataModelBridge()->CanDelete(theInstances[idx]); - } - theReturn = canDelete; - } else // Any keyframe can be cut - { - theReturn = true; +bool CDoc::canCut() +{ + // copyable keyframes and actions are cuttable (i.e. can be deleted). + if (canCopySelectedActions() || canCopySelectedKeyframes()) + return true; + + if (canCopySelectedObjects()) { + // Check the Object is not the scene. The Object cannot be the last layer as well + qt3dsdm::TInstanceHandleList theInstances = m_SelectedValue.GetSelectedInstances(); + bool canDelete = !theInstances.empty(); + for (size_t idx = 0, end = theInstances.size() && canDelete; idx < end; ++idx) { + canDelete &= GetDocumentReader().IsInstance(theInstances[idx]) + && GetStudioSystem()->GetClientDataModelBridge()->CanDelete(theInstances[idx]); } + return canDelete; } - return theReturn; + return false; } -//============================================================================== /** * Handles the duplicate command passed by mainframe. * Makes a copy of the currently selected item (if there is one) and attaches @@ -2182,7 +2076,6 @@ void CDoc::HandleDuplicateCommand(bool slide) } } -//============================================================================= /** * Verify that an asset can be renamed. Only actions are affected by rename at this point, so prompt * user to proceed if the actions will be hosed. @@ -2217,7 +2110,6 @@ bool CDoc::VerifyCanRename(qt3dsdm::Qt3DSDMInstanceHandle inAsset) return theResult; } -//============================================================================== /** * Load a stream of a UIP file. */ @@ -2262,7 +2154,6 @@ void CDoc::LoadPresentationFile(CBufferedInputStream *inInputStream) } } -//============================================================================== /** * Loads the Studio object data from an archive * Loads Studio object data from a presentation file archive. @@ -2304,7 +2195,7 @@ int CDoc::LoadStudioData(CBufferedInputStream *inInputStream) // We definitely don't want a million events firing off during this deserialization. std::shared_ptr<IComposerSerializer> theSerializer(CreateTransactionlessSerializer()); - theSerializer->SerializeScene(theReader, GetDocumentDirectory(), (int)theVersion); + theSerializer->SerializeScene(theReader, GetDocumentDirectory(), int(theVersion)); } auto bridge = GetStudioSystem()->GetClientDataModelBridge(); @@ -2331,7 +2222,6 @@ int CDoc::LoadStudioData(CBufferedInputStream *inInputStream) return theVersion; } -//============================================================================== /** * Create new data core. Typically in construction or loading a new presentation */ @@ -2420,7 +2310,7 @@ std::shared_ptr<Q3DStudio::IComposerSerializer> CDoc::CreateTransactionlessSeria std::shared_ptr<qt3dsdm::IDOMWriter> CDoc::CreateDOMWriter() { using namespace qt3dsdm; - qt3ds::QT3DSI32 theFileVersion = STUDIO_FILE_VERSION; + qt3ds::QT3DSI32 theFileVersion = UIP_VERSION; TStringTablePtr theStringTable( m_StudioSystem->GetFullSystem()->GetCoreSystem()->GetDataCore()->GetStringTablePtr()); std::shared_ptr<IDOMWriter> theWriterPtr( @@ -2483,7 +2373,7 @@ DoCreateDOMReader(qt3ds::foundation::IInStream &inStream, IDOMReader &theReader(*retval); theReader.Att("version", outVersion); - if (outVersion > STUDIO_FILE_VERSION || outVersion < STUDIO_LAST_SUPPORTED_FILE_VERSION) + if (outVersion > UIP_VERSION || outVersion < LAST_SUPPORTED_UIP_VERSION) return std::shared_ptr<qt3dsdm::IDOMReader>(); if (!theReader.MoveToFirstChild(L"Project")) return std::shared_ptr<qt3dsdm::IDOMReader>(); @@ -2542,7 +2432,7 @@ struct SBufferFilter return m_Map.find(m_StringTable.GetWideStr(inItem.first.c_str())) == m_Map.end(); } }; -//============================================================================== + /** * SavePresentationFile: Saves the presentation file. * @param inArchive CArchive for saving data @@ -2622,10 +2512,6 @@ void CDoc::SavePresentationFile(CBufferedOutputStream *inOutputStream) CDOMSerializer::Write(*theWriter.GetTopElement(), theStream); } -//============================================================================= -/** - * - */ void CDoc::SetKeyframeInterpolation() { if (m_KeyframesManager) @@ -2638,7 +2524,6 @@ void CDoc::DeselectAllKeyframes() m_KeyframesManager->DeselectAllKeyframes(); } -//============================================================================== /** * Recursive function to get all actions affected by renaming the asset with inObjectId. * I think the logic behind this is that once the parent will affect all children's path @@ -2701,7 +2586,6 @@ qt3dsdm::Qt3DSDMInstanceHandle CDoc::getPasteTarget(qt3dsdm::Qt3DSDMInstanceHand return pasteTarget; } -//============================================================================== /** * Image is a property of the material. * Recursively iterate the images involved by the object and do either of following: @@ -2797,7 +2681,6 @@ void CDoc::IterateImageInstances(qt3dsdm::Qt3DSDMInstanceHandle inInstance, } } -//============================================================================= /** * @returns the object based on the selection mode */ @@ -2823,7 +2706,6 @@ qt3dsdm::Qt3DSDMInstanceHandle CDoc::GetObjectbySelectMode(qt3dsdm::Qt3DSDMInsta return theResult; } -//============================================================================= /** * @returns the topmost group object that owns this instance */ @@ -2862,7 +2744,6 @@ qt3dsdm::Qt3DSDMInstanceHandle CDoc::GetTopmostGroup(qt3dsdm::Qt3DSDMInstanceHan } } -//============================================================================== /** * Image is a property of the material, find out all images involved by the delete * object and scehedule a remove instances. @@ -2873,7 +2754,6 @@ void CDoc::ScheduleRemoveImageInstances(qt3dsdm::Qt3DSDMInstanceHandle inInstanc IterateImageInstances(inInstance, nullptr); } -//============================================================================== /** * Remove all DataModel instances and schedule a delete */ @@ -2891,7 +2771,6 @@ void CDoc::ScheduleRemoveDataModelInstances(qt3dsdm::Qt3DSDMInstanceHandle inIns outBatch->AddCommand(theCmd); } -//============================================================================== /** * inObject may be a Component or it may have children Component, find out all Components involved * by the delete @@ -3224,7 +3103,7 @@ void CDoc::ReplaceDatainput(const QString &oldName, const QString &newName, // Open a single transaction for all datainput replaces, so that all binding replacements // done from within f.ex datainput management dialog can be undone with a single undo. - if (!IsTransactionOpened()) + if (!isTransactionOpened()) OpenTransaction(QObject::tr("Replace datainput bindings"), __FILE__, __LINE__); for (auto it : instances) { @@ -3243,7 +3122,7 @@ void CDoc::ReplaceDatainput(const QString &oldName, const QString &newName, for (int i = 0; i < splitStr.size() - 1; i += 2) { if (splitStr[i].contains(oldName)) { - splitStr[i] = QLatin1String("$") + newName; + splitStr[i] = QLatin1Char('$') + newName; renamed = true; } newStr.append(QStringLiteral(" ") + splitStr[i] + QStringLiteral(" ") @@ -3275,8 +3154,7 @@ QString CDoc::GetCurrentController(qt3dsdm::Qt3DSDMInstanceHandle instHandle, Q3DStudio::CString currPropValStr = qt3dsdm::get<qt3dsdm::TDataStrPtr>(currPropVal)->GetData(); - Q3DStudio::CString propName - = propSys->GetName(propHandle).c_str(); + Q3DStudio::CString propName = propSys->GetName(propHandle).c_str(); // Datainput controller name is always prepended with "$". Differentiate // between datainput and property that has the same name by searching specifically diff --git a/src/Authoring/Client/Code/Core/Doc/Doc.h b/src/Authoring/Client/Code/Core/Doc/Doc.h index 1a82ae02..e0e1f299 100644 --- a/src/Authoring/Client/Code/Core/Doc/Doc.h +++ b/src/Authoring/Client/Code/Core/Doc/Doc.h @@ -27,62 +27,37 @@ ** ****************************************************************************/ -//============================================================================== -// Prefix -//============================================================================== #ifndef INCLUDED_DOC_H -#define INCLUDED_DOC_H 1 +#define INCLUDED_DOC_H -#pragma once - -//============================================================================== -// Includes -//============================================================================== -#include "Conditional.h" -#include "Qt3DSFile.h" #include "Qt3DSRect.h" #include "IDoc.h" #include "GUIDUtilities.h" #include "GraphUtils.h" #include "CmdStackModifier.h" -#include "Qt3DSColor.h" -#include "SelectedValueImpl.h" #include "Utility/CoreConst.h" #include <QtCore/quuid.h> #include <QtCore/qsize.h> #include <QtCore/qhash.h> -//============================================================================== -// Forwards -//============================================================================== -class CScene; -class CCamera; -class CLight; -class CHotKeys; class CCmdBatch; -class CStudioProjectSettings; -class CView; -class ISelectable; class CBufferedInputStream; class CBufferedOutputStream; class CDataManager; -class CClientDataModelBridge; class IKeyframesManager; class IObjectReferenceHelper; class CCore; -class CRenderContext; class CPlaybackClock; +struct SDocumentDataModelListener; namespace Q3DStudio { class IInternalDocumentEditor; class CFilePath; -class IInternalDirectoryWatchingSystem; class IDirectoryWatchingSystem; class IImportFailedHandler; class IDeletingReferencedObjectHandler; class IMoveRenameHandler; -class CTransactionCloseListenerSignaller; class IDocSceneGraph; struct SSelectedValue; } @@ -93,10 +68,6 @@ class ISignalConnection; class CmdDataModel; } -QT_FORWARD_DECLARE_CLASS(QWidget) - -struct SDocumentDataModelListener; - namespace std { template <> struct hash<GUID> @@ -113,7 +84,6 @@ struct hash<GUID> }; struct AreGuidsEqual { - bool operator()(const GUID &lhs, const GUID &rhs) const { return memcmp(&lhs, &rhs, sizeof(GUID)) == 0; @@ -121,7 +91,6 @@ struct AreGuidsEqual }; } - struct SubPresentationRecord { QString m_type; @@ -203,22 +172,19 @@ public: void removeControlFromInstance(const qt3dsdm::Qt3DSDMInstanceHandle handle); }; -//============================================================================== -// CDoc Class -//============================================================================== - class CDoc : public QObject, public IDoc, public ICmdStackModifier { Q_OBJECT + public: friend struct SDocumentDataModelListener; + CDoc(CCore *inCore); virtual ~CDoc(); DEFINE_OBJECT_COUNTER(CDoc) - void - SetDirectoryWatchingSystem(std::shared_ptr<Q3DStudio::IDirectoryWatchingSystem> inSystem); + void SetDirectoryWatchingSystem(std::shared_ptr<Q3DStudio::IDirectoryWatchingSystem> inSystem); void SetImportFailedHandler(std::shared_ptr<Q3DStudio::IImportFailedHandler> inHandler); std::shared_ptr<Q3DStudio::IImportFailedHandler> GetImportFailedHandler(); void SetDocMessageBoxHandler( @@ -255,8 +221,8 @@ public: QString GetCurrentController(qt3dsdm::Qt3DSDMInstanceHandle instHandle, qt3dsdm::Qt3DSDMPropertyHandle propHandle) const; - bool IsModified(); - bool IsValid() const; + bool isModified() const; + bool isValid() const; qt3dsdm::Qt3DSDMInstanceHandle GetInstanceFromSelectable( Q3DStudio::SSelectedValue inSelectedItem) const; @@ -264,8 +230,8 @@ public: void CutSelectedObject(); void DeleteSelectedItems(bool slide = false); - void DeleteSelectedObject(bool slide = false); - bool DeleteSelectedKeys(); + void deleteSelectedObject(bool slide = false); + bool deleteSelectedKeyframes(); void SetChangedKeyframes(); // Cut object to clipboard @@ -304,17 +270,17 @@ public: void HandleMasterPaste(); void HandleCut(); - bool CanCopyObject(); // specifically for objects - bool CanCopyObject(const qt3dsdm::TInstanceHandleList &inInstances); // specifically for objects - bool CanCopyKeyframe(); // specifically for keyframes - bool CanCopyAction(); // specifically for actions - bool CanPasteObject() const; // specifically for objects - bool CanPasteKeyframe(); // specifically for keyframes - bool CanPasteAction(); // specifically for actions - - bool CanPaste(); // for objects or keyframes or actions - bool CanCopy(); // for objects or keyframes or actions - bool CanCut(); // for objects or keyframes or actions + bool canCopySelectedObjects() const; + bool canCopyObjects(const qt3dsdm::TInstanceHandleList &inInstances) const; + bool canCopySelectedKeyframes() const; + bool canCopySelectedActions() const; + bool canPasteObjects() const; + bool canPasteKeyframes() const; + bool canPasteActions() const; + + bool canPaste() const; // objects, keyframes, or actions + bool canCopy() const; // objects, keyframes, or actions + bool canCut(); // objects, keyframes, or actions void HandleDuplicateCommand(bool slide = false); bool VerifyCanRename(qt3dsdm::Qt3DSDMInstanceHandle inAsset); @@ -350,9 +316,8 @@ public: void DeselectAllKeyframes() override; void SetModifiedFlag(bool inIsModified = true) override; void SetKeyframesManager(IKeyframesManager *inManager) override; - IKeyframesManager *GetKeyframesManager() override; - qt3dsdm::IPropertySystem *GetPropertySystem() override; - qt3dsdm::IAnimationCore *GetAnimationCore() override; + qt3dsdm::IPropertySystem *GetPropertySystem() const override; + qt3dsdm::IAnimationCore *GetAnimationCore() const override; void SetInstancePropertyValue(qt3dsdm::Qt3DSDMInstanceHandle inInstance, const std::wstring &inPropertyName, const qt3dsdm::SValue &inValue) override; @@ -371,12 +336,12 @@ public: Q3DStudio::IDocumentReader &GetDocumentReader() override; Q3DStudio::IDocumentEditor &OpenTransaction(const QString &inCmdName, const char *inFile, int inLine) override; - Q3DStudio::IDocumentEditor &MaybeOpenTransaction(const QString &cmdName, const char *inFile, + Q3DStudio::IDocumentEditor &maybeOpenTransaction(const QString &cmdName, const char *inFile, int inLine) override; - bool IsTransactionOpened() const override; - void RollbackTransaction() override; - void CloseTransaction() override; - void IKnowWhatIAmDoingForceCloseTransaction() override; + bool isTransactionOpened() const override; + void rollbackTransaction() override; + void closeTransaction() override; + void forceCloseTransaction() override; std::shared_ptr<Q3DStudio::IComposerSerializer> CreateSerializer() override; virtual std::shared_ptr<Q3DStudio::IComposerSerializer> CreateTransactionlessSerializer(); @@ -401,20 +366,7 @@ public: void TruncateTimebar(bool inSetStart, bool inAffectsChildren); - // Helper methods for Edit Camera - // These need to move to the render system. - // They are view specific properties and have nothing to do with - // the document. - /* - CEditCameraContainer* GetEditCameraContainer( ); - CCamera* GetCurrentEditCamera( ); - CLight* GetEditingLight( ); - long GetEditingFillMode( ); - bool IsInEditMode( ); - Q3DStudio::CColor GetEditViewBackgroundColor( ); - */ - - qt3dsdm::CStudioSystem *GetStudioSystem() override { return m_StudioSystem.get(); } + qt3dsdm::CStudioSystem *GetStudioSystem() const override { return m_StudioSystem.get(); } IObjectReferenceHelper *GetDataModelObjectReferenceHelper() const { @@ -439,8 +391,8 @@ public: bool inGroupMode); // ICmdStackModifier - bool CanUndo() override; - bool PreUndo() override; + bool canUndo() override; + bool preUndo() override; void getSceneMaterials(qt3dsdm::Qt3DSDMInstanceHandle inParent, QVector<qt3dsdm::Qt3DSDMInstanceHandle> &outMats) const; @@ -468,6 +420,9 @@ public: void queueMaterialRename(const QString &oldName, const QString &newName); + void OnNewPresentation(); + void OnPresentationDeactivated(); + protected: // Set the active slide, return true if delving void SetActiveSlideChange(qt3dsdm::Qt3DSDMSlideHandle inNewActiveSlide); @@ -482,7 +437,6 @@ protected: void SavePresentationFile(CBufferedOutputStream *inOutputStream); void CleanupData(); - void ResetData(); int LoadStudioData(CBufferedInputStream *inInputStream); void ResetDataCore(); void SetupDataCoreSignals(); @@ -495,7 +449,7 @@ protected: void GetActionDependencies(qt3dsdm::Qt3DSDMInstanceHandle inInstance, qt3dsdm::TActionHandleList &ioActionList); - qt3dsdm::Qt3DSDMInstanceHandle GetFirstSelectableLayer(); + qt3dsdm::Qt3DSDMInstanceHandle getFirstSelectableLayer(); qt3dsdm::Qt3DSDMInstanceHandle GetTopmostGroup(qt3dsdm::Qt3DSDMInstanceHandle inInstance); void GetActionsAffectedByRename(qt3dsdm::Qt3DSDMInstanceHandle inAsset, @@ -508,30 +462,26 @@ protected: QMultiMap<QString, QPair<qt3dsdm::Qt3DSDMInstanceHandle, qt3dsdm::Qt3DSDMPropertyHandle>> *outMap); - //========================================================================== - // Protected Fields - //========================================================================== - - long m_PlayMode; ///< This tracks whether we're playing a client presentation or not. + long m_PlayMode; // This tracks whether we're playing a client presentation or not. Q3DStudio::SSelectedValue m_SelectedObject; - long m_CurrentViewTime; ///< The current time that is displayed by the playhead, not necessarily - ///the client time. - qt3dsdm::Qt3DSDMInstanceHandle m_SceneInstance; ///< Pointer to the root level Scene object. - qt3dsdm::Qt3DSDMSlideHandle m_ActiveSlide; ///< The currently active Slide Handle. - qt3dsdm::Qt3DSDMInstanceHandle m_ActiveLayer; ///< The currently active layer. - CPlaybackClock *m_PlaybackClock; ///< Playback clock. This is used when user clicks "Play" + long m_CurrentViewTime; // The current time that is displayed by the playhead, not necessarily + // the client time. + qt3dsdm::Qt3DSDMInstanceHandle m_SceneInstance; // Pointer to the root level Scene object. + qt3dsdm::Qt3DSDMSlideHandle m_ActiveSlide; // The currently active Slide Handle. + qt3dsdm::Qt3DSDMInstanceHandle m_ActiveLayer; // The currently active layer. + CPlaybackClock *m_PlaybackClock; // Playback clock. This is used when user clicks "Play" CCore *m_Core; bool m_IsModified; bool m_IsTemporary; QString m_DocumentPath; - CDataManager *m_DataManager; ///< Manager for handling data properties. + CDataManager *m_DataManager; // Manager for handling data properties. std::shared_ptr<qt3dsdm::CStudioSystem> m_StudioSystem; - IKeyframesManager *m_KeyframesManager; ///< To support menu actions for selected keys + IKeyframesManager *m_KeyframesManager; // To support menu actions for selected keys - IObjectReferenceHelper *m_DataModelObjectRefHelper; ///< To support object reference control + IObjectReferenceHelper *m_DataModelObjectRefHelper; // To support object reference control TAssetGraphPtr m_AssetGraph; @@ -552,15 +502,9 @@ protected: QVector<QPair<QString, QString>> m_materialRenames; QVector<QPair<QString, QString>> m_materialUndoRenames; -public: - void OnNewPresentation(); - void OnPresentationDeactivated(); - -protected: - CRenderContext *m_RenderContext; ///< The render context attached to this player's window. - Qt3DSRenderDevice m_WindowHandle; ///< The window handle to which to render + Qt3DSRenderDevice m_WindowHandle; // The window handle to which to render Q3DStudio::CRect m_ClientSize; - Q3DStudio::CRect m_SceneRect; ///< The dimensions of the active scene view + Q3DStudio::CRect m_SceneRect; // The dimensions of the active scene view private: bool m_playbackPreviewOn = false; diff --git a/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp b/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp index ba6e1fd9..5d406fc6 100644 --- a/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp +++ b/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp @@ -939,9 +939,9 @@ public: { m_StudioSystem.GetFullSystem()->EndAggregateOperation(); } - void Rollback() override { m_Doc.RollbackTransaction(); } + void Rollback() override { m_Doc.rollbackTransaction(); } // Release when finished editing - void Release() override { m_Doc.CloseTransaction(); } + void Release() override { m_Doc.closeTransaction(); } bool FilterForNotInSlideAndNotInstance(Q3DStudio::TIdentifier inInstance, Qt3DSDMSlideHandle inSlide, @@ -3769,7 +3769,7 @@ public: } } catch (...) { theDispatch.FireOnProgressEnd(); - m_Doc.RollbackTransaction(); // Run away!!! + m_Doc.rollbackTransaction(); // Run away!!! } return 0; } @@ -5614,12 +5614,12 @@ IDocumentEditor &CUpdateableDocumentEditor::EnsureEditor(const QString &inComman m_File = inFile; m_Line = inLine; } - return m_EditorIDocDoc.MaybeOpenTransaction(inCommandName, inFile, inLine); + return m_EditorIDocDoc.maybeOpenTransaction(inCommandName, inFile, inLine); } bool CUpdateableDocumentEditor::HasEditor() const { - return m_EditorIDocDoc.IsTransactionOpened() && m_File != NULL; + return m_EditorIDocDoc.isTransactionOpened() && m_File != NULL; } void CUpdateableDocumentEditor::FireImmediateRefresh(qt3dsdm::Qt3DSDMInstanceHandle *inInstances, @@ -5632,7 +5632,7 @@ void CUpdateableDocumentEditor::FireImmediateRefresh(qt3dsdm::Qt3DSDMInstanceHan void CUpdateableDocumentEditor::CommitEditor() { if (HasEditor()) { - m_EditorIDocDoc.CloseTransaction(); + m_EditorIDocDoc.closeTransaction(); m_File = NULL; } } @@ -5640,8 +5640,8 @@ void CUpdateableDocumentEditor::CommitEditor() void CUpdateableDocumentEditor::RollbackEditor() { if (HasEditor()) { - m_EditorIDocDoc.RollbackTransaction(); - m_EditorIDocDoc.CloseTransaction(); + m_EditorIDocDoc.rollbackTransaction(); + m_EditorIDocDoc.closeTransaction(); m_File = NULL; } } diff --git a/src/Authoring/Client/Code/Core/Doc/IDoc.h b/src/Authoring/Client/Code/Core/Doc/IDoc.h index 2299ccab..94150d4d 100644 --- a/src/Authoring/Client/Code/Core/Doc/IDoc.h +++ b/src/Authoring/Client/Code/Core/Doc/IDoc.h @@ -75,10 +75,6 @@ class CString; class IComposerSerializer; } -//============================================================================== -/** - * Doc - */ class IDoc { public: @@ -91,7 +87,7 @@ public: virtual void NotifySelectionChanged( Q3DStudio::SSelectedValue inNewSelection = Q3DStudio::SSelectedValue()) = 0; - virtual qt3dsdm::CStudioSystem *GetStudioSystem() = 0; + virtual qt3dsdm::CStudioSystem *GetStudioSystem() const = 0; virtual void SetKeyframeInterpolation() = 0; virtual void DeselectAllKeyframes() = 0; @@ -99,10 +95,9 @@ public: virtual void SetModifiedFlag(bool inIsModified = true) = 0; virtual void SetKeyframesManager(IKeyframesManager *inManager) = 0; - virtual IKeyframesManager *GetKeyframesManager() = 0; - virtual qt3dsdm::IPropertySystem *GetPropertySystem() = 0; - virtual qt3dsdm::IAnimationCore *GetAnimationCore() = 0; + virtual qt3dsdm::IPropertySystem *GetPropertySystem() const = 0; + virtual qt3dsdm::IAnimationCore *GetAnimationCore() const = 0; virtual void SetInstancePropertyValue(qt3dsdm::Qt3DSDMInstanceHandle inInstance, const std::wstring &inPropertyName, const qt3dsdm::SValue &inValue) = 0; @@ -133,13 +128,13 @@ public: // Get the document editor if a transaction has already been opened. // Else open a new transaction. - virtual Q3DStudio::IDocumentEditor &MaybeOpenTransaction(const QString &cmdName, + virtual Q3DStudio::IDocumentEditor &maybeOpenTransaction(const QString &cmdName, const char *inFile, int inLine) = 0; - virtual bool IsTransactionOpened() const = 0; + virtual bool isTransactionOpened() const = 0; // Undo whatever has been done and clear the transaction's // internal data. Leave the transaction open and on the stack, however. - virtual void RollbackTransaction() = 0; - virtual void CloseTransaction() = 0; + virtual void rollbackTransaction() = 0; + virtual void closeTransaction() = 0; // This should only be called from a global exception handler or something like that. // This will close the transaction regardless of the open count. @@ -148,7 +143,7 @@ public: // command reconfiguring the UI. There are cases, however, when you really want the command to // be // committed right at this very moment (like just before undo). - virtual void IKnowWhatIAmDoingForceCloseTransaction() = 0; + virtual void forceCloseTransaction() = 0; virtual std::shared_ptr<Q3DStudio::IComposerSerializer> CreateSerializer() = 0; // Create a DOM writer that is opened to the project element. This is where the serializer diff --git a/src/Authoring/Studio/Application/DataInputListDlg.cpp b/src/Authoring/Studio/Application/DataInputListDlg.cpp index c9782b40..2f8bc29b 100644 --- a/src/Authoring/Studio/Application/DataInputListDlg.cpp +++ b/src/Authoring/Studio/Application/DataInputListDlg.cpp @@ -415,8 +415,8 @@ void CDataInputListDlg::accept() if (m_deletedDiInUse) QTimer::singleShot(0, &g_StudioApp, &CStudioApp::checkDeletedDatainputs); - if (g_StudioApp.GetCore()->GetDoc()->IsTransactionOpened()) { - g_StudioApp.GetCore()->GetDoc()->CloseTransaction(); + if (g_StudioApp.GetCore()->GetDoc()->isTransactionOpened()) { + g_StudioApp.GetCore()->GetDoc()->closeTransaction(); // If a datainput has been edited (and datainput controller names // updated in element "controlledproperty" properties), we need to make all changes // non-undoable. This is because datainput definitions in UIA file (and in global @@ -432,8 +432,8 @@ void CDataInputListDlg::accept() void CDataInputListDlg::reject() { // If the user cancels, also roll back any possible changes to data input bindings. - if (g_StudioApp.GetCore()->GetDoc()->IsTransactionOpened()) - g_StudioApp.GetCore()->GetDoc()->RollbackTransaction(); + if (g_StudioApp.GetCore()->GetDoc()->isTransactionOpened()) + g_StudioApp.GetCore()->GetDoc()->rollbackTransaction(); QDialog::reject(); } diff --git a/src/Authoring/Studio/Application/ProjectFile.cpp b/src/Authoring/Studio/Application/ProjectFile.cpp index 991756fd..a306a976 100644 --- a/src/Authoring/Studio/Application/ProjectFile.cpp +++ b/src/Authoring/Studio/Application/ProjectFile.cpp @@ -410,10 +410,10 @@ QString ProjectFile::createPreview() QString uipPrvPath = doc->GetDocumentPath(); // Commit all open transactions - doc->IKnowWhatIAmDoingForceCloseTransaction(); + doc->forceCloseTransaction(); // create a preview uip if doc modified - if (doc->IsModified()) { + if (doc->isModified()) { uipPrvPath.replace(QLatin1String(".uip"), QLatin1String("_@preview@.uip")); g_StudioApp.GetCore()->OnSaveDocument(uipPrvPath, true); } @@ -437,7 +437,7 @@ QString ProjectFile::createPreview() .firstChildElement(QStringLiteral("assets")); assetsElem.setAttribute(QStringLiteral("initial"), doc->getPresentationId()); - if (doc->IsModified()) { + if (doc->isModified()) { // Set the preview uip path in the uia file QDomNodeList pNodes = assetsElem.elementsByTagName(QStringLiteral("presentation")); for (int i = 0; i < pNodes.count(); ++i) { diff --git a/src/Authoring/Studio/Application/StudioApp.cpp b/src/Authoring/Studio/Application/StudioApp.cpp index e4d9d9b4..9875f39d 100644 --- a/src/Authoring/Studio/Application/StudioApp.cpp +++ b/src/Authoring/Studio/Application/StudioApp.cpp @@ -276,8 +276,8 @@ void CStudioApp::performShutdown() m_core->GetDispatch()->RemoveCoreAsynchronousEventListener(this); // close transactions before we call destructors - if (m_core->GetDoc()->IsTransactionOpened()) - m_core->GetDoc()->CloseTransaction(); + if (m_core->GetDoc()->isTransactionOpened()) + m_core->GetDoc()->closeTransaction(); qCInfo(qt3ds::TRACE_INFO) << "Studio exiting successfully"; } @@ -968,7 +968,7 @@ void CStudioApp::OnCopy() bool CStudioApp::CanCopy() { - return m_core->GetDoc()->CanCopy(); + return m_core->GetDoc()->canCopy(); } //============================================================================= @@ -981,9 +981,9 @@ QString CStudioApp::GetCopyType() QString theCopyType; CDoc *theDoc = m_core->GetDoc(); - if (theDoc->CanCopyAction()) + if (theDoc->canCopySelectedActions()) theCopyType = tr("Action"); - else if (theDoc->CanCopyKeyframe()) + else if (theDoc->canCopySelectedKeyframes()) theCopyType = tr("Keyframes"); else theCopyType = tr("Object"); @@ -1013,7 +1013,7 @@ QString CStudioApp::getDeleteType() const // Delete priority: keyframes, slides, objects const bool slide = qobject_cast<SlideView *>(m_lastActiveView) != nullptr; CDoc *doc = m_core->GetDoc(); - if (doc->GetKeyframesManager()->HasSelectedKeyframes()) { + if (m_pMainWnd->getTimelineWidget()->hasSelectedKeyframes()) { return tr("Keyframes"); } else if (slide) { // Check if the slide is the last one or the master @@ -1120,7 +1120,7 @@ void CStudioApp::OnCut() bool CStudioApp::CanCut() { - return m_core->GetDoc()->CanCut(); + return m_core->GetDoc()->canCut(); } //============================================================================= @@ -1134,7 +1134,7 @@ void CStudioApp::OnPaste() bool CStudioApp::CanPaste() { - return m_core->GetDoc()->CanPaste(); + return m_core->GetDoc()->canPaste(); } //============================================================================= @@ -1147,9 +1147,9 @@ QString CStudioApp::GetPasteType() QString thePasteType; CDoc *theDoc = m_core->GetDoc(); - if (theDoc->CanPasteAction()) + if (theDoc->canPasteActions()) thePasteType = tr("Action"); - else if (theDoc->CanPasteObject()) + else if (theDoc->canPasteObjects()) thePasteType = tr("Object"); else thePasteType = tr("Keyframes"); @@ -1185,7 +1185,7 @@ void CStudioApp::HandleSetChangedKeys() */ void CStudioApp::DeleteSelectedKeys() { - m_core->GetDoc()->DeleteSelectedKeys(); + m_core->GetDoc()->deleteSelectedKeyframes(); } //============================================================================= @@ -1285,7 +1285,7 @@ bool CStudioApp::IsPlaying() */ void CStudioApp::OnRevert() { - if (!m_core->GetDoc()->IsModified() || m_dialogs->ConfirmRevert()) { + if (!m_core->GetDoc()->isModified() || m_dialogs->ConfirmRevert()) { QString theCurrentDoc = m_core->GetDoc()->GetDocumentPath(); OnLoadDocument(theCurrentDoc); } @@ -1297,7 +1297,7 @@ void CStudioApp::OnRevert() */ bool CStudioApp::CanRevert() const { - return m_core->GetDoc()->IsModified() && m_core->GetDoc()->IsValid(); + return m_core->GetDoc()->isModified() && m_core->GetDoc()->isValid(); } //============================================================================== @@ -1319,7 +1319,7 @@ void CStudioApp::OnFileOpenRecent(const QString &inDocument) */ bool CStudioApp::PerformSavePrompt() { - if (m_core->GetDoc()->IsModified()) { + if (m_core->GetDoc()->isModified()) { CDialogs::ESavePromptResult theResult = m_dialogs->PromptForSave(); if (theResult == CDialogs::SAVE_FIRST) { bool onSaveResult = OnSave(); diff --git a/src/Authoring/Studio/DragAndDrop/TimelineDropSource.cpp b/src/Authoring/Studio/DragAndDrop/TimelineDropSource.cpp index 765db415..ac4b5bd5 100644 --- a/src/Authoring/Studio/DragAndDrop/TimelineDropSource.cpp +++ b/src/Authoring/Studio/DragAndDrop/TimelineDropSource.cpp @@ -84,7 +84,7 @@ bool CTimeLineDropSource::CanCopy() { bool theReturn = false; // This is here because some Assets can not be copied ( scene, material ) - theReturn = m_Copy && g_StudioApp.GetCore()->GetDoc()->CanCopyObject(m_Instances); + theReturn = m_Copy && g_StudioApp.GetCore()->GetDoc()->canCopyObjects(m_Instances); return theReturn; } diff --git a/src/Authoring/Studio/MainFrm.cpp b/src/Authoring/Studio/MainFrm.cpp index f97f442c..2aff8b36 100644 --- a/src/Authoring/Studio/MainFrm.cpp +++ b/src/Authoring/Studio/MainFrm.cpp @@ -671,8 +671,7 @@ void CMainFrame::OnUpdateTimelineDeleteSelectedKeyframes() */ void CMainFrame::OnUpdateTimelineSetInterpolation() { - m_ui->actionSet_Interpolation->setEnabled( - g_StudioApp.GetCore()->GetDoc()->GetKeyframesManager()->HasSelectedKeyframes()); + m_ui->actionSet_Interpolation->setEnabled(getTimelineWidget()->hasSelectedKeyframes()); } /** @@ -718,7 +717,7 @@ void CMainFrame::OnFileSave() void CMainFrame::OnUpdateFileSave() { - m_ui->action_Save->setEnabled(g_StudioApp.GetCore()->GetDoc()->IsModified()); + m_ui->action_Save->setEnabled(g_StudioApp.GetCore()->GetDoc()->isModified()); } /** @@ -770,7 +769,7 @@ void CMainFrame::closeEvent(QCloseEvent *event) handleGeometryAndState(true); QMainWindow::closeEvent(event); - if (g_StudioApp.GetCore()->GetDoc()->IsModified()) { + if (g_StudioApp.GetCore()->GetDoc()->isModified()) { CDialogs::ESavePromptResult theResult = g_StudioApp.GetDialogs()->PromptForSave(); if (theResult == CDialogs::SAVE_FIRST) { // If the save was canceled or failed then do not exit. diff --git a/src/Authoring/Studio/Palettes/Action/ActionView.cpp b/src/Authoring/Studio/Palettes/Action/ActionView.cpp index ec7c9be4..41d67789 100644 --- a/src/Authoring/Studio/Palettes/Action/ActionView.cpp +++ b/src/Authoring/Studio/Palettes/Action/ActionView.cpp @@ -244,7 +244,7 @@ QAbstractItemModel *ActionView::propertyModel() const QString ActionView::targetObjectName() const { - if (!GetDoc()->IsValid() || !m_itemHandle.Valid()) + if (!GetDoc()->isValid() || !m_itemHandle.Valid()) return QString(); const auto actionInfo = m_actionsModel->actionInfoAt(m_currentActionIndex); @@ -261,7 +261,7 @@ QString ActionView::targetObjectName() const QString ActionView::triggerObjectName() const { - if (!GetDoc()->IsValid() || !m_itemHandle.Valid()) + if (!GetDoc()->isValid() || !m_itemHandle.Valid()) return QString(); const auto actionInfo = m_actionsModel->actionInfoAt(m_currentActionIndex); @@ -278,7 +278,7 @@ QString ActionView::triggerObjectName() const QString ActionView::eventName() const { - if (!GetDoc()->IsValid() || !m_itemHandle.Valid()) + if (!GetDoc()->isValid() || !m_itemHandle.Valid()) return QString(); const auto actionInfo = m_actionsModel->actionInfoAt(m_currentActionIndex); @@ -292,7 +292,7 @@ QString ActionView::eventName() const QString ActionView::handlerName() const { - if (!GetDoc()->IsValid() || !m_itemHandle.Valid()) + if (!GetDoc()->isValid() || !m_itemHandle.Valid()) return QString(); const auto actionInfo = m_actionsModel->actionInfoAt(m_currentActionIndex); @@ -636,7 +636,7 @@ void ActionView::updateFiredEvent() } const auto doc = GetDoc(); - if (!doc->IsValid()) + if (!doc->isValid()) return; const auto bridge = GetBridge(); @@ -1035,7 +1035,7 @@ void ActionView::updateHandlerArguments() m_currentPropertyNameHandle = 0; m_handlerArguments.clear(); const auto doc = GetDoc(); - if (!doc->IsValid() || !m_itemHandle.Valid()) + if (!doc->isValid() || !m_itemHandle.Valid()) return; const auto actionInfo = m_actionsModel->actionInfoAt(m_currentActionIndex); diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp index 2ad5825a..f50418e9 100644 --- a/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp +++ b/src/Authoring/Studio/Palettes/Inspector/InspectorControlModel.cpp @@ -441,7 +441,7 @@ void InspectorControlModel::setMatDatas(const std::vector<Q3DStudio::CFilePath> m_matDatas.clear(); const auto doc = g_StudioApp.GetCore()->GetDoc(); - bool isDocModified = doc->IsModified(); + bool isDocModified = doc->isModified(); const auto sceneEditor = doc->getSceneEditor(); if (!sceneEditor) return; diff --git a/src/Authoring/Studio/Palettes/Project/ProjectFileSystemModel.cpp b/src/Authoring/Studio/Palettes/Project/ProjectFileSystemModel.cpp index 832f4ddc..6e859bf3 100644 --- a/src/Authoring/Studio/Palettes/Project/ProjectFileSystemModel.cpp +++ b/src/Authoring/Studio/Palettes/Project/ProjectFileSystemModel.cpp @@ -624,7 +624,7 @@ void ProjectFileSystemModel::showInfo(int row) if (fi.suffix() == QLatin1String("materialdef")) { const auto doc = g_StudioApp.GetCore()->GetDoc(); - bool isDocModified = doc->IsModified(); + bool isDocModified = doc->isModified(); { // Scope for the ScopedDocumentEditor Q3DStudio::ScopedDocumentEditor sceneEditor( Q3DStudio::SCOPED_DOCUMENT_EDITOR(*doc, QString())); diff --git a/src/Authoring/Studio/Palettes/Slide/SlideModel.cpp b/src/Authoring/Studio/Palettes/Slide/SlideModel.cpp index 8265d6bc..c07377c1 100644 --- a/src/Authoring/Studio/Palettes/Slide/SlideModel.cpp +++ b/src/Authoring/Studio/Palettes/Slide/SlideModel.cpp @@ -336,7 +336,7 @@ bool SlideModel::hasSlideWithName(const QString &name) const QString SlideModel::slideName(const qt3dsdm::Qt3DSDMSlideHandle &handle) const { auto doc = GetDoc(); - if (!doc->IsValid()) + if (!doc->isValid()) return {}; const auto instanceHandle = doc->GetStudioSystem()->GetSlideSystem()->GetSlideInstance(handle); return GetBridge()->GetName(instanceHandle).toQString(); @@ -435,7 +435,7 @@ int SlideModel::rowToSlideIndex(int row) const CClientDataModelBridge *SlideModel::GetBridge() const { auto doc = GetDoc(); - if (!doc->IsValid()) + if (!doc->isValid()) return nullptr; return doc->GetStudioSystem()->GetClientDataModelBridge(); } diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp index 37b830b4..53768a47 100644 --- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp +++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp @@ -590,7 +590,7 @@ bool Qt3DSDMTimelineItemBinding::IsValidTransaction(EUserTransaction inTransacti return g_StudioApp.CanCopy(); case EUserTransaction_Paste: - return m_TransMgr->GetDoc()->CanPasteObject(); + return m_TransMgr->GetDoc()->canPasteObjects(); case EUserTransaction_Delete: if (theInstance.Valid()) diff --git a/src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineWidget.cpp b/src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineWidget.cpp index a9dba0c8..d37825cb 100644 --- a/src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineWidget.cpp +++ b/src/Authoring/Studio/Palettes/TimelineGraphicsView/TimelineWidget.cpp @@ -245,7 +245,7 @@ TimelineWidget::TimelineWidget(const QSize &preferredSize, QWidget *parent) CDoc *doc = g_StudioApp.GetCore()->GetDoc(); connect(m_toolbar, &TimelineToolbar::deleteLayerTriggered, - [=](){ doc->DeleteSelectedObject(); }); + [=](){ doc->deleteSelectedObject(); }); connect(m_toolbar, &TimelineToolbar::gotoTimeTriggered, this, [=]() { CDoc *doc = g_StudioApp.GetCore()->GetDoc(); diff --git a/src/Authoring/Studio/Render/StudioRenderer.cpp b/src/Authoring/Studio/Render/StudioRenderer.cpp index f6361a69..678fd6c0 100644 --- a/src/Authoring/Studio/Render/StudioRenderer.cpp +++ b/src/Authoring/Studio/Render/StudioRenderer.cpp @@ -489,9 +489,9 @@ struct SRendererImpl : public IStudioRenderer, void SetGuidesEnabled(bool val) override { m_GuidesEnabled = val; } - bool AreGuidesEditable() const override { return m_Doc.IsValid() ? m_Doc.GetDocumentReader().AreGuidesEditable() : false; } + bool AreGuidesEditable() const override { return m_Doc.isValid() ? m_Doc.GetDocumentReader().AreGuidesEditable() : false; } - void SetGuidesEditable(bool val) override { if (m_Doc.IsValid()) m_Doc.GetDocumentReader().SetGuidesEditable(val); } + void SetGuidesEditable(bool val) override { if (m_Doc.isValid()) m_Doc.GetDocumentReader().SetGuidesEditable(val); } // Setting the camera to -1 disables the edit cameras // So setting the camera to 0- (numcameras - 1) will set change the active |