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

Removes Driller from ScriptCanvas

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-12-02 13:55:00 -08:00
parent de06bb75e5
commit 59ef6f983f
16 changed files with 1 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzCore/AzCore/std/parallel/threadbus.h
+1 -1
View File
@@ -8,9 +8,9 @@
#ifndef AZSTD_THREAD_BUS_H
#define AZSTD_THREAD_BUS_H 1
#include <AzCore/Driller/DrillerBus.h>
#include <AzCore/std/parallel/thread.h>
#include <AzCore/std/parallel/mutex.h>
#include <AzCore/EBus/EBus.h>
namespace AZStd
{
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Substance/builder/ui/stylesheets/style_dark.qss
-85
View File
@@ -1116,91 +1116,6 @@ QPushButton#captureButton:disabled {
/*----------------------------------------------------------------------------*/
/*----------------------------------------------------------------------------*/
Driller--DrillerCaptureWindow > #centralwidget > #playButton {
color: white;
}
Driller--DrillerCaptureWindow > #centralwidget > AzToolsFramework--AZAutoSizingScrollArea#scrollArea {
background-color: rgb(100,100,100);
border: 1px solid rgb(100,100,100);
}
/*----------------------------------------------------------------------------*/
/*----------------------------------------------------------------------------*/
Driller--DrillerMainWindow QDockWidget
{
background: rgb(56, 58, 59);
}
Driller--DrillerMainWindow QDockWidget::title
{
background: rgb(56, 58, 59);
}
Driller--DrillerMainWindow QDockWidget .QWidget
{
background: rgb(56, 58, 59);
border: 0px solid red;
}
/*----------------------------------------------------------------------------*/
/*----------------------------------------------------------------------------*/
Driller--ChannelControl > QFrame {
background-color: rgb(100, 100, 100);
}
Driller--ChannelControl > #infoArea > QLabel {
color: #999999;
font-size: 12px;
font-family: "open sans";
font-weight:600;
}
/*----------------------------------------------------------------------------*/
/*----------------------------------------------------------------------------*/
Driller--ChannelProfilerWidget #profilerName {
color: #cccccc;
font-size: 13px;
font-family: "open sans";
}
/*----------------------------------------------------------------------------*/
/*----------------------------------------------------------------------------*/
Driller--AnnotationHeaderView {
background-color: rgb(80,80,80);
}
Driller--AnnotationHeaderView > #frame {
background-color: rgb(80,80,80);
}
Driller--AnnotationHeaderView > #frame > #annotationBackground {
background-color: rgb(80,80,80);
}
Driller--AnnotationHeaderView > #frame > #annotationBackground > #configureAnnotations {
color: white;
}
/*----------------------------------------------------------------------------*/
/*----------------------------------------------------------------------------*/
/*----------------------------------------------------------------------------*/
/*----------------------------------------------------------------------------*/
Driller--CollapsiblePanel > QGroupBox {
background-color: rgb(56, 58, 59);
margin-top: 0px;
}
/*----------------------------------------------------------------------------*/
/*----------------------------------------------------------------------------*/
AzToolsFramework--TargetSelectorButton#targetButton {
color: white;
}
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/stylesheets/style_dark.qss
-85
View File
@@ -1116,91 +1116,6 @@ QPushButton#captureButton:disabled {
/*----------------------------------------------------------------------------*/
/*----------------------------------------------------------------------------*/
Driller--DrillerCaptureWindow > #centralwidget > #playButton {
color: white;
}
Driller--DrillerCaptureWindow > #centralwidget > AzToolsFramework--AZAutoSizingScrollArea#scrollArea {
background-color: rgb(100,100,100);
border: 1px solid rgb(100,100,100);
}
/*----------------------------------------------------------------------------*/
/*----------------------------------------------------------------------------*/
Driller--DrillerMainWindow QDockWidget
{
background: rgb(56, 58, 59);
}
Driller--DrillerMainWindow QDockWidget::title
{
background: rgb(56, 58, 59);
}
Driller--DrillerMainWindow QDockWidget .QWidget
{
background: rgb(56, 58, 59);
border: 0px solid red;
}
/*----------------------------------------------------------------------------*/
/*----------------------------------------------------------------------------*/
Driller--ChannelControl > QFrame {
background-color: rgb(100, 100, 100);
}
Driller--ChannelControl > #infoArea > QLabel {
color: #999999;
font-size: 12px;
font-family: "open sans";
font-weight:600;
}
/*----------------------------------------------------------------------------*/
/*----------------------------------------------------------------------------*/
Driller--ChannelProfilerWidget #profilerName {
color: #cccccc;
font-size: 13px;
font-family: "open sans";
}
/*----------------------------------------------------------------------------*/
/*----------------------------------------------------------------------------*/
Driller--AnnotationHeaderView {
background-color: rgb(80,80,80);
}
Driller--AnnotationHeaderView > #frame {
background-color: rgb(80,80,80);
}
Driller--AnnotationHeaderView > #frame > #annotationBackground {
background-color: rgb(80,80,80);
}
Driller--AnnotationHeaderView > #frame > #annotationBackground > #configureAnnotations {
color: white;
}
/*----------------------------------------------------------------------------*/
/*----------------------------------------------------------------------------*/
/*----------------------------------------------------------------------------*/
/*----------------------------------------------------------------------------*/
Driller--CollapsiblePanel > QGroupBox {
background-color: rgb(56, 58, 59);
margin-top: 0px;
}
/*----------------------------------------------------------------------------*/
/*----------------------------------------------------------------------------*/
AzToolsFramework--TargetSelectorButton#targetButton {
color: white;
}
Gems/Multiplayer/Code/Tests/MockInterfaces.h
-1
View File
@@ -144,7 +144,6 @@ namespace UnitTest
MOCK_METHOD0(GetJsonRegistrationContext, AZ::JsonRegistrationContext* ());
MOCK_CONST_METHOD0(GetEngineRoot, const char* ());
MOCK_CONST_METHOD0(GetExecutableFolder, const char* ());
MOCK_METHOD0(GetDrillerManager, AZ::Debug::DrillerManager* ());
MOCK_METHOD1(ResolveModulePath, void(AZ::OSString&));
MOCK_METHOD0(GetAzCommandLine, AZ::CommandLine* ());
MOCK_CONST_METHOD1(QueryApplicationType, void(AZ::ApplicationTypeQuery&));
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Graph.cpp
-1
View File
@@ -37,7 +37,6 @@
#include <ScriptCanvas/Libraries/Core/SendScriptEvent.h>
#include <ScriptCanvas/Libraries/Core/Start.h>
#include <ScriptCanvas/Libraries/Core/UnaryOperator.h>
#include <ScriptCanvas/Profiler/Driller.h>
#include <ScriptCanvas/Translation/Translation.h>
#include <ScriptCanvas/Variable/VariableBus.h>
#include <ScriptCanvas/Variable/VariableData.h>
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/Aggregator.cpp
-15
View File
@@ -1,15 +0,0 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project.
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
namespace ScriptCanvas
{
namespace Profiler
{
}
}
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/Aggregator.h
-15
View File
@@ -1,15 +0,0 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project.
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
#pragma once
namespace ScriptCanvas
{
namespace Profiler
{
}
}
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/Driller.cpp
-31
View File
@@ -1,31 +0,0 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project.
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
#include <ScriptCanvas/Core/Graph.h>
#include <ScriptCanvas/Core/Node.h>
namespace ScriptCanvas
{
namespace Profiler
{
void Driller::OnNodeExecute(Node* node)
{
m_output->BeginTag(AZ_CRC("ScriptCanvasGraphDriller", 0xb161ccb2));
{
m_output->BeginTag(AZ_CRC("OnNodeExecute", 0x3e51a5eb));
{
m_output->Write(AZ_CRC("NodeName", 0x606d4587), node->GetEntity()->GetName());
m_output->Write(AZ_CRC("NodeType", 0xb2906ca8), node->RTTI_GetTypeName());
}
m_output->EndTag(AZ_CRC("StringEvent", 0xd1e005df));
}
m_output->EndTag(AZ_CRC("ScriptCanvasGraphDriller", 0xb161ccb2));
}
}
}
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/Driller.h
-116
View File
@@ -1,116 +0,0 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project.
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
#pragma once
#include <AzCore/Driller/Driller.h>
#include <AzCore/Driller/DrillerBus.h>
namespace ScriptCanvas
{
class Graph;
class Node;
namespace Profiler
{
class DrillerInterface
: public AZ::Debug::DrillerEBusTraits
{
public:
// On Entry
// On Execute/Upate
// On Exit
virtual void OnNodeExecute(Node*) = 0;
};
using DrillerBus = AZ::EBus<DrillerInterface>;
class DrillerCommandInterface
: public AZ::Debug::DrillerEBusTraits
{
public:
virtual Graph* RequestDrilledGraph() = 0;
};
using DrillerCommandBus = AZ::EBus<DrillerCommandInterface>;
class Driller
: public AZ::Debug::Driller
, public DrillerBus::Handler
{
bool m_isDetailedCapture;
Graph* m_drilledGraph;
using ParamArrayType = AZStd::vector<Param>;
ParamArrayType m_params;
public:
AZ_CLASS_ALLOCATOR(Driller, AZ::SystemAllocator, 0);
const char* GroupName() const override { return "ScriptCanvasDrillers"; }
const char* GetName() const override { return "ScriptCanvasGraphDriller"; }
const char* GetDescription() const override { return "Drilling the Script Canvas execution engine"; }
int GetNumParams() const override { return static_cast<int>(m_params.size()); }
const Param* GetParam(int index) const override { return &m_params[index]; }
Driller()
: m_isDetailedCapture(false)
, m_drilledGraph(nullptr)
{
Param isDetailed;
isDetailed.desc = "IsDetailedDrill";
isDetailed.name = AZ_CRC("IsDetailedDrill", 0x2155cef2);
isDetailed.type = Param::PT_BOOL;
isDetailed.value = 0;
m_params.push_back(isDetailed);
}
void Start(const Param* params = nullptr, int numParams = 0) override
{
m_isDetailedCapture = m_params[0].value != 0;
if (params)
{
for (int i = 0; i < numParams; i++)
{
if (params[i].name == m_params[0].name)
{
m_isDetailedCapture = params[i].value != 0;
}
}
}
DrillerCommandBus::BroadcastResult(m_drilledGraph, &DrillerCommandInterface::RequestDrilledGraph);
// AZ_TEST_ASSERT(m_drilledGraph != nullptr); /// Make sure we have our object by the time we started the driller
m_output->BeginTag(AZ_CRC("ScriptCanvasGraphDriller", 0xb161ccb2));
m_output->Write(AZ_CRC("OnStart", 0x8b372fca), m_isDetailedCapture);
// write drilled object initial state
m_output->EndTag(AZ_CRC("ScriptCanvasGraphDriller", 0xb161ccb2));
BusConnect();
}
void Stop() override
{
//m_drilledGraph = nullptr;
//m_output->BeginTag(AZ_CRC("ScriptCanvasGraphDriller"));
//m_output->Write(AZ_CRC("OnStop"), m_isDetailedCapture);
//m_output->EndTag(AZ_CRC("ScriptCanvasGraphDriller"));
//BusDisconnect();
}
void OnNodeExecute(Node* node) override;
};
}
}
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/DrillerEvents.cpp
-15
View File
@@ -1,15 +0,0 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project.
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
namespace ScriptCanvas
{
namespace Profiler
{
}
}
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/DrillerEvents.h
-30
View File
@@ -1,30 +0,0 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project.
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
#pragma once
#include <AzCore/Memory/SystemAllocator.h>
#include <AzCore/RTTI/RTTI.h>
namespace ScriptCanvas
{
namespace Profiler
{
namespace Event
{
class GraphExecutionStart
{
public:
AZ_CLASS_ALLOCATOR(GraphExecutionStart, AZ::SystemAllocator, 0)
AZ_RTTI(GraphExecutionStart, "{AAB7E2E1-9096-4F51-90CA-259A057F2D88}");
GraphExecutionStart()
{}
};
}
}
}
Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_BehaviorContextUtils.cpp
-1
View File
@@ -37,7 +37,6 @@ namespace ScriptCanvasUnitTest
const char* GetExecutableFolder() const override { return nullptr; }
const char* GetBinFolder() const { return nullptr; }
const char* GetAppRoot() override { return nullptr; }
AZ::Debug::DrillerManager* GetDrillerManager() override { return nullptr; }
void EnumerateEntities(const EntityCallback& /*callback*/) override {}
void Init(AZ::BehaviorContext* behaviorContext)
Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_ScriptCanvasBuilderComponent.cpp
-1
View File
@@ -41,7 +41,6 @@ namespace ScriptCanvasUnitTest
const char* GetExecutableFolder() const override { return nullptr; }
const char* GetBinFolder() const { return nullptr; }
const char* GetAppRoot() override { return nullptr; }
AZ::Debug::DrillerManager* GetDrillerManager() override { return nullptr; }
void EnumerateEntities(const EntityCallback& /*callback*/) override {}
// AssetBuilderBus
Gems/ScriptCanvas/Code/scriptcanvasgem_common_files.cmake
-2
View File
@@ -191,8 +191,6 @@ set(FILES
Include/ScriptCanvas/Libraries/Operators/Math/OperatorSub.cpp
Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeable.cpp
Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeableNode.cpp
Include/ScriptCanvas/Profiler/Aggregator.cpp
Include/ScriptCanvas/Profiler/DrillerEvents.cpp
Include/ScriptCanvas/Serialization/BehaviorContextObjectSerializer.cpp
Include/ScriptCanvas/Serialization/DatumSerializer.cpp
Include/ScriptCanvas/Serialization/RuntimeVariableSerializer.cpp
Gems/ScriptCanvas/Code/scriptcanvasgem_headers.cmake
-3
View File
@@ -351,9 +351,6 @@ set(FILES
Include/ScriptCanvas/Libraries/Operators/Math/OperatorSub.ScriptCanvasGrammar.xml
Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeable.h
Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeableNode.h
Include/ScriptCanvas/Profiler/Driller.h
Include/ScriptCanvas/Profiler/Aggregator.h
Include/ScriptCanvas/Profiler/DrillerEvents.h
Include/ScriptCanvas/Serialization/BehaviorContextObjectSerializer.h
Include/ScriptCanvas/Serialization/DatumSerializer.h
Include/ScriptCanvas/Serialization/RuntimeVariableSerializer.h
Gems/ScriptCanvasTesting/Code/Source/Framework/ScriptCanvasTestFixture.h
-1
View File
@@ -10,7 +10,6 @@
#include <AzCore/Asset/AssetManagerComponent.h>
#include <AzCore/Component/ComponentApplicationBus.h>
#include <AzCore/Driller/Driller.h>
#include <AzCore/IO/FileIO.h>
#include <AzCore/Memory/MemoryComponent.h>
#include <AzCore/Serialization/EditContext.h>