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

fixed unit tests bugs, removed commented out code, removed loading spam

Browse Source 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
This commit is contained in:
chcurran
2021-11-24 18:55:11 -08:00
committed by Chris Burel
parent 8357fa34e9
commit c4ea3075cc
23 changed files with 52 additions and 640 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Graph.cpp
+5 -8
View File
@@ -72,19 +72,16 @@ namespace ScriptCanvas
componentElementNode.AddElementWithData(context, "m_assetType", azrtti_typeid<RuntimeAsset>());
}
if (componentElementNode.GetVersion() <= GraphCpp::GraphVersion::RemoveFunctionGraphMarker)
if (auto subElement = componentElementNode.FindElement(AZ_CRC_CE("isFunctionGraph")); subElement > 0)
{
componentElementNode.RemoveElementByName(AZ_CRC_CE("isFunctionGraph"));
componentElementNode.RemoveElement(subElement);
}
if (componentElementNode.GetVersion() < GraphCpp::GraphVersion::FixupVersionDataTypeId)
if (auto subElement = componentElementNode.FindSubElement(AZ_CRC_CE("versionData")))
{
if (auto subElement = componentElementNode.FindSubElement(AZ_CRC_CE("versionData")))
if (subElement->GetId() == azrtti_typeid<SlotId>())
{
if (subElement->GetId() == azrtti_typeid<SlotId>())
{
componentElementNode.RemoveElementByName(AZ_CRC_CE("versionData"));
}
componentElementNode.RemoveElementByName(AZ_CRC_CE("versionData"));
}
}
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Nodeable.cpp
+2 -6
View File
@@ -22,16 +22,12 @@ namespace ScriptCanvas
Nodeable::Nodeable()
: m_noOpFunctor(&NodeableOutCpp::NoOp)
{
AZ_TracePrintf("SCDB", "How many times does this get called? Because it should....NOT GET CALLED!");
}
{}
Nodeable::Nodeable(ExecutionStateWeakPtr executionState)
: m_noOpFunctor(&NodeableOutCpp::NoOp)
, m_executionState(executionState)
{
AZ_TracePrintf("SCDB", "How many times does this get called 2?");
}
{}
#if !defined(RELEASE)
void Nodeable::CallOut(size_t index, AZ::BehaviorValueParameter* resultBVP, AZ::BehaviorValueParameter* argsBVPs, int numArguments) const
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp
+2 -48
View File
@@ -68,9 +68,7 @@ namespace ExecutionInterpretedAPICpp
{
if (lua_isstring(lua, -1))
{
AZStd::string errorResult = lua_tostring(lua, -1);
AZ_TracePrintf("ScriptCanvas", errorResult.c_str());
AZ::ScriptContext::FromNativeContext(lua)->Error(AZ::ScriptContext::ErrorType::Error, true, "%s", lua_tostring(lua, -1));
AZ::ScriptContext::FromNativeContext(lua)->Error(AZ::ScriptContext::ErrorType::Error, true, lua_tostring(lua, -1));
}
else
{
@@ -403,51 +401,7 @@ namespace ScriptCanvas
// \note: the the object is being constructed, and is assumed to never leave or re-enter Lua again
AZ_Assert(lua_isuserdata(lua, -2) && !lua_islightuserdata(lua, -2), "Error in compiled lua file, 1st argument to OverrideNodeableMetatable is not userdata (Nodeable)");
AZ_Assert(lua_istable(lua, -1), "Error in compiled lua file, 2nd argument to OverrideNodeableMetatable is not a Lua table");
/* table is in the stack at index 't' */
if (lua_istable(lua, -1))
{
lua_getfield(lua, -1, "__index");
if (lua_istable(lua, -1))
{
int t = -2;
AZStd::string tableGuts;
lua_pushnil(lua);
/* first key */
while (lua_next(lua, t) != 0)
{
/* uses 'key' (at index -2) and 'value' (at index -1) */
if (lua_type(lua, -2) == LUA_TSTRING)
{
size_t len;
tableGuts += AZStd::string::format("%s - %s\n",
lua_tolstring(lua, -2, &len),
lua_typename(lua, lua_type(lua, -1)));
}
else if (lua_type(lua, -2) == LUA_TNUMBER)
{
tableGuts += AZStd::string::format("%f - %s\n",
lua_tonumber(lua, -2),
lua_typename(lua, lua_type(lua, -1)));
}
else
{
tableGuts += AZStd::string::format("%s - %s\n",
lua_typename(lua, lua_type(lua, -2)),
lua_typename(lua, lua_type(lua, -1)));
}
/* removes 'value'; keeps 'key' for next iteration */
lua_pop(lua, 1);
}
AZ_TracePrintf("SCDB", tableGuts.c_str());
}
lua_pop(lua, 1);
}
[[maybe_unused]] auto userData = reinterpret_cast<AZ::LuaUserData*>(lua_touserdata(lua, -2));
AZ_Assert(userData && userData->magicData == AZ_CRC_CE("AZLuaUserData"), "this isn't user data");
// Lua: LuaUserData::nodeable, class_mt
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedPerActivation.cpp
+1 -63
View File
@@ -111,75 +111,13 @@ namespace ScriptCanvas
auto& lua = m_luaState;
// Lua:
lua_rawgeti(lua, LUA_REGISTRYINDEX, registryIndex);
if (!lua_isuserdata(lua, -1))
{
AZ_TracePrintf("SCDB", "No light userdata");
}
// Lua: instance
lua_getmetatable(lua, -1);
if (!lua_istable(lua, -1))
{
AZ_TracePrintf("SCDB", "no metatable");
}
/* table is in the stack at index 't' */
if (lua_istable(lua, -1))
{
int t = -2;
AZStd::string tableGuts;
lua_pushnil(lua);
/* first key */
while (lua_next(lua, t) != 0)
{
/* uses 'key' (at index -2) and 'value' (at index -1) */
if (lua_type(lua, -2) == LUA_TSTRING)
{
size_t len;
tableGuts += AZStd::string::format("%s - %s\n",
lua_tolstring(lua, -2, &len),
lua_typename(lua, lua_type(lua, -1)));
}
else if (lua_type(lua, -2) == LUA_TNUMBER)
{
tableGuts += AZStd::string::format("%f - %s\n",
lua_tonumber(lua, -2),
lua_typename(lua, lua_type(lua, -1)));
}
else
{
tableGuts += AZStd::string::format("%s - %s\n",
lua_typename(lua, lua_type(lua, -2)),
lua_typename(lua, lua_type(lua, -1)));
}
/* removes 'value'; keeps 'key' for next iteration */
lua_pop(lua, 1);
}
AZ_TracePrintf("SCDB", tableGuts.c_str());
}
// Lua: instance, instance_mt
lua_pop (lua, 1);
// Lua: instance
lua_getfield(lua, -1, Grammar::k_OnGraphStartFunctionName);
// Lua: instance, graph_VM.k_OnGraphStartFunctionName
if (!lua_isfunction(lua, -1))
{
AZ_TracePrintf("SCDB", "No function");
}
lua_pushvalue(lua, -2);
if (!lua_isuserdata(lua, -1))
{
AZ_TracePrintf("SCDB", "No light userdata");
}
// Lua: instance, graph_VM.k_OnGraphStartFunctionName, instance
const int result = Execution::InterpretedSafeCall(lua, 1, 0);
// Lua: instance ?
// Lua: instance, ?
if (result == LUA_OK)
{
// Lua: instance