Removed all references to Plushie

This commit is contained in:
Kah Wei 2022-09-14 20:26:31 +08:00
parent 7e4c6a986a
commit 95c3609d21
6 changed files with 17 additions and 17 deletions

View File

@ -144,6 +144,6 @@ namespace SHADE
static std::string buildTpaList(const std::string& directory); static std::string buildTpaList(const std::string& directory);
static void throwIfFailed(const std::string& errMsg, int resultCode); static void throwIfFailed(const std::string& errMsg, int resultCode);
}; };
} // namespace PlushieEngine::Scripts }
#include "SHDotNetRuntime.hpp" #include "SHDotNetRuntime.hpp"

View File

@ -25,7 +25,7 @@ namespace SHADE
/*--------------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------------*/
/* Static Definitions */ /* Static Definitions */
/*--------------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------------*/
const std::string SHScriptEngine::DEFAULT_CSHARP_NAMESPACE = std::string(DEFAULT_CSHARP_LIB_NAME); const std::string SHScriptEngine::DEFAULT_CSHARP_NAMESPACE = std::string("SHADE");
SHDotNetRuntime SHScriptEngine::dotNet { false }; SHDotNetRuntime SHScriptEngine::dotNet { false };
SHScriptEngine::CsFuncPtr SHScriptEngine::csEngineInit = nullptr; SHScriptEngine::CsFuncPtr SHScriptEngine::csEngineInit = nullptr;
SHScriptEngine::CsFuncPtr SHScriptEngine::csEngineLoadScripts = nullptr; SHScriptEngine::CsFuncPtr SHScriptEngine::csEngineLoadScripts = nullptr;
@ -185,7 +185,7 @@ namespace SHADE
// Prepare directory (delete useless files) // Prepare directory (delete useless files)
deleteFolder("net5.0"); deleteFolder("net5.0");
deleteFolder("ref"); deleteFolder("ref");
deleteFolder("../PlushieGameManaged"); deleteFolder("../SHADE_Scripting");
deleteFolder("../obj"); deleteFolder("../obj");
// Attempt to build the assembly // Attempt to build the assembly
@ -196,12 +196,12 @@ namespace SHADE
const bool BUILD_SUCCESS = execProcess const bool BUILD_SUCCESS = execProcess
( (
L"C:\\Windows\\system32\\cmd.exe", L"C:\\Windows\\system32\\cmd.exe",
L"/K \"dotnet build \"../PlushieGameManaged.csproj\" -c Debug -o \"./tmp/\" -fl -flp:LogFile=build.log;Verbosity=quiet & exit\"" L"/K \"dotnet build \"../SHADE_Scripting.csproj\" -c Debug -o \"./tmp/\" -fl -flp:LogFile=build.log;Verbosity=quiet & exit\""
) == 0; ) == 0;
if (BUILD_SUCCESS) if (BUILD_SUCCESS)
{ {
// Copy to built dll to the working directory and replace // Copy to built dll to the working directory and replace
std::filesystem::copy_file("./tmp/PlushieGameManaged.dll", "PlushieGameManaged.dll", std::filesystem::copy_options::overwrite_existing); std::filesystem::copy_file("./tmp/SHADE_Managed.dll", "SHADE_Managed.dll", std::filesystem::copy_options::overwrite_existing);
oss << "[ScriptEngine] Successfully built Managed Script Assembly (" << MANAGED_SCRIPT_LIB_NAME << ")!"; oss << "[ScriptEngine] Successfully built Managed Script Assembly (" << MANAGED_SCRIPT_LIB_NAME << ")!";
SHLOG_INFO(oss.str()); SHLOG_INFO(oss.str());
@ -256,8 +256,8 @@ namespace SHADE
<None Remove=\".gitmodules\" />\n\ <None Remove=\".gitmodules\" />\n\
</ItemGroup>\n\ </ItemGroup>\n\
<ItemGroup>\n\ <ItemGroup>\n\
<Reference Include=\"PlushieAPI\">\n\ <Reference Include=\"SHADE_Managed\">\n\
<HintPath>.\\bin\\PlushieAPI.dll</HintPath>\n\ <HintPath>.\\bin\\SHADE_Managed.dll</HintPath>\n\
</Reference>\n\ </Reference>\n\
</ItemGroup>\n\ </ItemGroup>\n\
</Project>"; </Project>";

View File

@ -60,7 +60,7 @@ namespace SHADE
/// </summary> /// </summary>
static void ReloadScriptAssembly(); static void ReloadScriptAssembly();
/// <summary> /// <summary>
/// Executes the FixedUpdate()s of the PlushieScripts that are attached to /// Executes the FixedUpdate()s of the Scripts that are attached to
/// Entities. /// Entities.
/// </summary> /// </summary>
static void ExecuteFixedUpdates(); static void ExecuteFixedUpdates();
@ -76,7 +76,7 @@ namespace SHADE
/// Adds a Script to a specified Entity. Note that while you can call this /// Adds a Script to a specified Entity. Note that while you can call this
/// multiple times on a specified Entity, it will work for all intents and /// multiple times on a specified Entity, it will work for all intents and
/// purposes but GetScript&lt;T&gt;() (C# only) currently only /// purposes but GetScript&lt;T&gt;() (C# only) currently only
/// gives you the first PlushieScript added of the specified type. /// gives you the first Script added of the specified type.
/// </summary> /// </summary>
/// <param name="entity">The entity to add a script to.</param> /// <param name="entity">The entity to add a script to.</param>
/// <param name="scriptName">Type name of the script to add.</param> /// <param name="scriptName">Type name of the script to add.</param>
@ -87,7 +87,7 @@ namespace SHADE
static bool AddScript(const SHEntity& entity, const std::string_view& scriptName); static bool AddScript(const SHEntity& entity, const std::string_view& scriptName);
/// <summary> /// <summary>
/// Removes all Scripts attached to the specified Entity. Does not do anything /// Removes all Scripts attached to the specified Entity. Does not do anything
/// if the specified Entity is invalid or does not have any PlushieScripts /// if the specified Entity is invalid or does not have any Scripts
/// attached. /// attached.
/// </summary> /// </summary>
/// <param name="entity">The entity to remove the scripts from.</param> /// <param name="entity">The entity to remove the scripts from.</param>
@ -96,7 +96,7 @@ namespace SHADE
/// Removes all Scripts attached to the specified Entity. Unlike /// Removes all Scripts attached to the specified Entity. Unlike
/// RemoveAllScripts(), this removes all the scripts immediately. /// RemoveAllScripts(), this removes all the scripts immediately.
/// Does not do anything if the specified Entity is invalid or does not have any /// Does not do anything if the specified Entity is invalid or does not have any
/// PlushieScripts attached. /// Scripts attached.
/// </summary> /// </summary>
/// <param name="entity">The entity to remove the scripts from.</param> /// <param name="entity">The entity to remove the scripts from.</param>
/// <param name="callOnDestroy"> /// <param name="callOnDestroy">
@ -131,13 +131,13 @@ namespace SHADE
/* Script Editor Functions */ /* Script Editor Functions */
/*-----------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------*/
/// <summary> /// <summary>
/// Renders the set of attached PlushieScripts for the specified Entity into the /// Renders the set of attached Scripts for the specified Entity into the
/// inspector. /// inspector.
/// <br/> /// <br/>
/// This function is meant for consumption from native code in the inspector /// This function is meant for consumption from native code in the inspector
/// rendering code. /// rendering code.
/// </summary> /// </summary>
/// <param name="entity">The Entity to render the PlushieScripts of.</param> /// <param name="entity">The Entity to render the Scripts of.</param>
static void RenderScriptsInInspector(const SHEntity& entity); static void RenderScriptsInInspector(const SHEntity& entity);
/*-----------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------*/
@ -145,7 +145,7 @@ namespace SHADE
/*-----------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------*/
/// <summary> /// <summary>
/// Utilises execution of a external batch file for invoking the dotnet build /// Utilises execution of a external batch file for invoking the dotnet build
/// tool to compile C# scripts in the Assets folder into the PlushieGameManaged /// tool to compile C# scripts in the Assets folder into the SHADE_Scripting
/// C# assembly DLL. /// C# assembly DLL.
/// </summary> /// </summary>
/// <param name="debug"> /// <param name="debug">

View File

@ -49,4 +49,4 @@ namespace SHADE
return std::system_category().message(errorCode); return std::system_category().message(errorCode);
} }
} // namespace PlushieEngine }

View File

@ -76,6 +76,6 @@ namespace SHADE
/*-------------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------------*/
SHStringUtils() = delete; SHStringUtils() = delete;
}; };
} // namespace PlushieEngine }
#include "SHStringUtils.hpp" #include "SHStringUtils.hpp"

View File

@ -43,4 +43,4 @@ namespace SHADE
return results; return results;
} }
} // namespace PlushieEngine }