diff options
author | Pasi Keränen <pasi.keranen@qt.io> | 2019-04-29 11:46:50 +0300 |
---|---|---|
committer | Pasi Keränen <pasi.keranen@qt.io> | 2019-05-06 19:47:31 +0000 |
commit | 2c2f18ec68e90713b8e4cd169987aa10d726b352 (patch) | |
tree | 1a43369e19db0cbd78bbd0dbb1ac0a6f5ce3d912 | |
parent | 569e8d5948c565d2f0fe4eeab8e87ba5dee274a0 (diff) |
Remove remaining state machine code
Remove state machine code and .uia file statemachine part.
Task-number: QT3DS-2846
Change-Id: Id4b74c296f9be4067e78906937dcb9086e60b949
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
-rw-r--r-- | src/Authoring/Studio/Application/ProjectFile.cpp | 9 | ||||
-rw-r--r-- | src/Runtime/Source/runtime/Qt3DSApplication.cpp | 2 | ||||
-rw-r--r-- | src/Runtime/Source/state/Qt3DSState.h | 14 | ||||
-rw-r--r-- | src/Runtime/Source/state/Qt3DSStateScriptContext.h | 5 |
4 files changed, 0 insertions, 30 deletions
diff --git a/src/Authoring/Studio/Application/ProjectFile.cpp b/src/Authoring/Studio/Application/ProjectFile.cpp index 11d4985c..809f3b70 100644 --- a/src/Authoring/Studio/Application/ProjectFile.cpp +++ b/src/Authoring/Studio/Application/ProjectFile.cpp @@ -387,15 +387,6 @@ void ProjectFile::create(const QString &uiaPath) QDomDocument domDoc; domDoc.setContent(QStringLiteral("<?xml version=\"1.0\" encoding=\"utf-8\"?>" "<application xmlns=\"http://qt.io/qt3dstudio/uia\">" - "<statemachine ref=\"#logic\">" - "<visual-states>" - "<state ref=\"Initial\">" - "<enter>" - "<goto-slide element=\"main:Scene\" rel=\"next\"/>" - "</enter>" - "</state>" - "</visual-states>" - "</statemachine>" "</application>")); QSaveFile file(uiaPath); diff --git a/src/Runtime/Source/runtime/Qt3DSApplication.cpp b/src/Runtime/Source/runtime/Qt3DSApplication.cpp index a1d5812d..a48f0c03 100644 --- a/src/Runtime/Source/runtime/Qt3DSApplication.cpp +++ b/src/Runtime/Source/runtime/Qt3DSApplication.cpp @@ -579,7 +579,6 @@ struct SApp : public IApplication nvvector<NVScopedRefCounted<IAppRunnable>> m_MainThreadRunnables; NVScopedRefCounted<IAppLoadContext> m_AppLoadContext; bool m_HideFPS; - bool m_DisableState; bool m_ProfileLogging; bool m_LastRenderWasDirty; QT3DSU64 m_LastFrameStartTime; @@ -629,7 +628,6 @@ struct SApp : public IApplication , m_MainThreadRunnables(inFactory.GetFoundation().getAllocator(), "SApp::m_MainThreadRunnables") , m_HideFPS(true) - , m_DisableState(true) , m_ProfileLogging(false) , m_LastRenderWasDirty(true) , m_LastFrameStartTime(0) diff --git a/src/Runtime/Source/state/Qt3DSState.h b/src/Runtime/Source/state/Qt3DSState.h index b5686c25..7f10f941 100644 --- a/src/Runtime/Source/state/Qt3DSState.h +++ b/src/Runtime/Source/state/Qt3DSState.h @@ -88,20 +88,6 @@ namespace state { class IEditor; class IEditorObject; } - - namespace debugger { - class IDebugOutStream; - struct STransitionId; - class IStateMachineListener; - class IStateMachineDebugInterface; - class IDebugger; - struct SDebugPropertyDeclaration; - class IDebuggedInterpreter; - class IDebuggerMasterListener; - class IDebuggedInterpreter; - struct SMicrostep; - class IScriptStateListener; - } } } diff --git a/src/Runtime/Source/state/Qt3DSStateScriptContext.h b/src/Runtime/Source/state/Qt3DSStateScriptContext.h index 110770a1..49b119ea 100644 --- a/src/Runtime/Source/state/Qt3DSStateScriptContext.h +++ b/src/Runtime/Source/state/Qt3DSStateScriptContext.h @@ -117,11 +117,6 @@ namespace state { virtual void SetInterpreter(IStateInterpreter &inInterpreter) = 0; virtual CRegisteredString GetContextType() { return CRegisteredString(); } - - // Dumps a differential state from the last time someone asked. This is a debug interface; - // not meant to be used - // by multiple listeners concurrently. - virtual void DumpState(debugger::IScriptStateListener &inListener) = 0; }; } } |