Merge branch 'main' into SP3-1-SerialisedRenderable
This commit is contained in:
commit
c7357d1cde
|
@ -1,16 +1,16 @@
|
||||||
[Window][MainStatusBar]
|
[Window][MainStatusBar]
|
||||||
Pos=0,1389
|
Pos=0,1060
|
||||||
Size=2547,20
|
Size=1920,20
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
|
|
||||||
[Window][SHEditorMenuBar]
|
[Window][SHEditorMenuBar]
|
||||||
Pos=0,48
|
Pos=0,48
|
||||||
Size=2547,1341
|
Size=1920,1012
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
|
|
||||||
[Window][Hierarchy Panel]
|
[Window][Hierarchy Panel]
|
||||||
Pos=0,172
|
Pos=0,142
|
||||||
Size=571,1217
|
Size=571,918
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
DockId=0x00000004,0
|
DockId=0x00000004,0
|
||||||
|
|
||||||
|
@ -20,25 +20,25 @@ Size=400,400
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
|
|
||||||
[Window][Inspector]
|
[Window][Inspector]
|
||||||
Pos=2276,48
|
Pos=1649,48
|
||||||
Size=271,1341
|
Size=271,1012
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
DockId=0x00000006,0
|
DockId=0x00000006,0
|
||||||
|
|
||||||
[Window][Profiler]
|
[Window][Profiler]
|
||||||
Pos=0,48
|
Pos=0,48
|
||||||
Size=571,122
|
Size=571,92
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
DockId=0x00000003,0
|
DockId=0x00000003,0
|
||||||
|
|
||||||
[Window][Viewport]
|
[Window][Viewport]
|
||||||
Pos=573,48
|
Pos=573,48
|
||||||
Size=1701,1341
|
Size=1074,1012
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
DockId=0x00000002,0
|
DockId=0x00000002,0
|
||||||
|
|
||||||
[Docking][Data]
|
[Docking][Data]
|
||||||
DockSpace ID=0xC5C9B8AB Window=0xBE4044E9 Pos=8,79 Size=2547,1341 Split=X
|
DockSpace ID=0xC5C9B8AB Window=0xBE4044E9 Pos=8,79 Size=1920,1012 Split=X
|
||||||
DockNode ID=0x00000005 Parent=0xC5C9B8AB SizeRef=1992,1036 Split=X
|
DockNode ID=0x00000005 Parent=0xC5C9B8AB SizeRef=1992,1036 Split=X
|
||||||
DockNode ID=0x00000001 Parent=0x00000005 SizeRef=571,1036 Split=Y Selected=0x1E6EB881
|
DockNode ID=0x00000001 Parent=0x00000005 SizeRef=571,1036 Split=Y Selected=0x1E6EB881
|
||||||
DockNode ID=0x00000003 Parent=0x00000001 SizeRef=225,94 Selected=0x1E6EB881
|
DockNode ID=0x00000003 Parent=0x00000001 SizeRef=225,94 Selected=0x1E6EB881
|
||||||
|
|
|
@ -37,7 +37,8 @@ project "SHADE_Application"
|
||||||
"%{IncludeDir.VULKAN}/include",
|
"%{IncludeDir.VULKAN}/include",
|
||||||
"%{IncludeDir.spdlog}/include",
|
"%{IncludeDir.spdlog}/include",
|
||||||
"%{IncludeDir.tinyddsloader}",
|
"%{IncludeDir.tinyddsloader}",
|
||||||
"%{IncludeDir.reactphysics3d}\\include"
|
"%{IncludeDir.reactphysics3d}\\include",
|
||||||
|
"%{IncludeDir.yamlcpp}"
|
||||||
}
|
}
|
||||||
|
|
||||||
externalwarnings "Off"
|
externalwarnings "Off"
|
||||||
|
@ -51,6 +52,7 @@ project "SHADE_Application"
|
||||||
{
|
{
|
||||||
"SHADE_Engine",
|
"SHADE_Engine",
|
||||||
"SHADE_Managed",
|
"SHADE_Managed",
|
||||||
|
"yaml-cpp",
|
||||||
"SDL2.lib",
|
"SDL2.lib",
|
||||||
"SDL2main.lib"
|
"SDL2main.lib"
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,7 +7,7 @@ namespace SHADE
|
||||||
{
|
{
|
||||||
SHCameraComponent::SHCameraComponent()
|
SHCameraComponent::SHCameraComponent()
|
||||||
:yaw(0.0f), pitch(0.0f), roll(0.0f)
|
:yaw(0.0f), pitch(0.0f), roll(0.0f)
|
||||||
, width(1920.0f), height(1080.0f), zNear(0.01f), zFar(10000.0f), fov(90.0f), movementSpeed(1.0f), turnSpeed(1.0f)
|
, width(1920.0f), height(1080.0f), zNear(0.01f), zFar(10000.0f), fov(90.0f), movementSpeed(1.0f), turnSpeed(0.5f)
|
||||||
, perspProj(true), dirtyView(true), dirtyProj(true)
|
, perspProj(true), dirtyView(true), dirtyProj(true)
|
||||||
, viewMatrix(), projMatrix()
|
, viewMatrix(), projMatrix()
|
||||||
, position()
|
, position()
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
#include "SHCameraSystem.h"
|
#include "SHCameraSystem.h"
|
||||||
#include "Math/SHMathHelpers.h"
|
#include "Math/SHMathHelpers.h"
|
||||||
#include "Input/SHInputManager.h"
|
#include "Input/SHInputManager.h"
|
||||||
|
#include "Math/Vector/SHVec2.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -12,56 +13,51 @@ namespace SHADE
|
||||||
{
|
{
|
||||||
SHCameraSystem* system = static_cast<SHCameraSystem*>(GetSystem());
|
SHCameraSystem* system = static_cast<SHCameraSystem*>(GetSystem());
|
||||||
auto& camera = system->editorCamera;
|
auto& camera = system->editorCamera;
|
||||||
SHVec3 target{ 0.0f,0.0f,-1.0f };
|
SHVec3 view, right, UP;
|
||||||
SHVec3 up = { 0.0f,1.0f,0.0f };
|
system->GetCameraAxis(camera, view, right, UP);
|
||||||
|
|
||||||
|
|
||||||
SHVec3::RotateY(target, SHMath::DegreesToRadians(camera.yaw));
|
|
||||||
SHVec3::RotateX(target, SHMath::DegreesToRadians(camera.pitch));
|
|
||||||
target += camera.position;
|
|
||||||
////SHVec3::RotateZ(target, SHMath::DegreesToRadians(camera.roll));
|
|
||||||
|
|
||||||
//target = SHVec3::Normalise(target);
|
|
||||||
|
|
||||||
SHVec3::RotateZ(up, camera.roll);
|
|
||||||
up = SHVec3::Normalise(up);
|
|
||||||
|
|
||||||
|
|
||||||
SHVec3 view = target - camera.position; view = SHVec3::Normalise(view);
|
|
||||||
SHVec3 right = SHVec3::Cross(view, up); right = SHVec3::Normalise(right);
|
|
||||||
const SHVec3 UP = SHVec3::Cross(view, right);
|
|
||||||
|
|
||||||
|
|
||||||
if (SHInputManager::GetKey(SHInputManager::SH_KEYCODE::A))
|
if (SHInputManager::GetKey(SHInputManager::SH_KEYCODE::A))
|
||||||
{
|
{
|
||||||
system->editorCamera.position -= right * dt * camera.movementSpeed;
|
camera.position -= right * dt * camera.movementSpeed;
|
||||||
system->editorCamera.dirtyView = true;
|
camera.dirtyView = true;
|
||||||
}
|
}
|
||||||
if (SHInputManager::GetKey(SHInputManager::SH_KEYCODE::D))
|
if (SHInputManager::GetKey(SHInputManager::SH_KEYCODE::D))
|
||||||
{
|
{
|
||||||
system->editorCamera.position += right * dt * camera.movementSpeed;
|
camera.position += right * dt * camera.movementSpeed;
|
||||||
system->editorCamera.dirtyView = true;
|
camera.dirtyView = true;
|
||||||
}
|
}
|
||||||
if (SHInputManager::GetKey(SHInputManager::SH_KEYCODE::W))
|
if (SHInputManager::GetKey(SHInputManager::SH_KEYCODE::W))
|
||||||
{
|
{
|
||||||
system->editorCamera.position += view * dt * camera.movementSpeed;
|
camera.position += view * dt * camera.movementSpeed;
|
||||||
system->editorCamera.dirtyView = true;
|
camera.dirtyView = true;
|
||||||
}
|
}
|
||||||
if (SHInputManager::GetKey(SHInputManager::SH_KEYCODE::S))
|
if (SHInputManager::GetKey(SHInputManager::SH_KEYCODE::S))
|
||||||
{
|
{
|
||||||
system->editorCamera.position -= view * dt * camera.movementSpeed;
|
camera.position -= view * dt * camera.movementSpeed;
|
||||||
system->editorCamera.dirtyView = true;
|
camera.dirtyView = true;
|
||||||
}
|
}
|
||||||
if (SHInputManager::GetKey(SHInputManager::SH_KEYCODE::Q))
|
if (SHInputManager::GetKey(SHInputManager::SH_KEYCODE::Q))
|
||||||
{
|
{
|
||||||
system->editorCamera.position += UP * dt * camera.movementSpeed;
|
camera.position += UP * dt * camera.movementSpeed;
|
||||||
system->editorCamera.dirtyView = true;
|
camera.dirtyView = true;
|
||||||
}
|
}
|
||||||
if (SHInputManager::GetKey(SHInputManager::SH_KEYCODE::E))
|
if (SHInputManager::GetKey(SHInputManager::SH_KEYCODE::E))
|
||||||
{
|
{
|
||||||
system->editorCamera.position -= UP * dt * camera.movementSpeed;
|
camera.position -= UP * dt * camera.movementSpeed;
|
||||||
system->editorCamera.dirtyView = true;
|
camera.dirtyView = true;
|
||||||
}
|
}
|
||||||
|
if (SHInputManager::GetKey(SHInputManager::SH_KEYCODE::RMB))
|
||||||
|
{
|
||||||
|
double mouseX, mouseY;
|
||||||
|
SHInputManager::GetMouseVelocity(&mouseX,&mouseY);
|
||||||
|
|
||||||
|
//std::cout << camera.yaw << std::endl;
|
||||||
|
|
||||||
|
camera.pitch -= mouseY * dt * camera.turnSpeed.x;
|
||||||
|
camera.yaw -= mouseX * dt * camera.turnSpeed.y;
|
||||||
|
camera.dirtyView = true;
|
||||||
|
}
|
||||||
|
|
||||||
system->UpdateCameraComponent(system->editorCamera);
|
system->UpdateCameraComponent(system->editorCamera);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -89,24 +85,9 @@ namespace SHADE
|
||||||
{
|
{
|
||||||
if (camera.dirtyView)
|
if (camera.dirtyView)
|
||||||
{
|
{
|
||||||
SHVec3 target{ 0.0f,0.0f,-1.0f };
|
|
||||||
SHVec3 up = { 0.0f,1.0f,0.0f };
|
SHVec3 view, right, UP;
|
||||||
|
GetCameraAxis(camera, view, right, UP);
|
||||||
|
|
||||||
SHVec3::RotateY(target, SHMath::DegreesToRadians(camera.yaw));
|
|
||||||
SHVec3::RotateX(target, SHMath::DegreesToRadians(camera.pitch));
|
|
||||||
target += camera.position;
|
|
||||||
////SHVec3::RotateZ(target, SHMath::DegreesToRadians(camera.roll));
|
|
||||||
|
|
||||||
//target = SHVec3::Normalise(target);
|
|
||||||
|
|
||||||
SHVec3::RotateZ(up, camera.roll);
|
|
||||||
up = SHVec3::Normalise(up);
|
|
||||||
|
|
||||||
|
|
||||||
SHVec3 view = target - camera.position; view = SHVec3::Normalise(view);
|
|
||||||
SHVec3 right = SHVec3::Cross(view, up); right = SHVec3::Normalise(right);
|
|
||||||
const SHVec3 UP = SHVec3::Cross(view, right);
|
|
||||||
|
|
||||||
camera.viewMatrix = SHMatrix::Identity;
|
camera.viewMatrix = SHMatrix::Identity;
|
||||||
camera.viewMatrix(0, 0) = right[0];
|
camera.viewMatrix(0, 0) = right[0];
|
||||||
|
@ -142,38 +123,51 @@ namespace SHADE
|
||||||
camera.projMatrix(3, 2) = 1.0f;
|
camera.projMatrix(3, 2) = 1.0f;
|
||||||
camera.projMatrix(2, 3) = -(camera.zFar * camera.zNear) / (camera.zFar - camera.zNear);
|
camera.projMatrix(2, 3) = -(camera.zFar * camera.zNear) / (camera.zFar - camera.zNear);
|
||||||
|
|
||||||
//const float fov_rad = SHMath::DegreesToRadians(camera.fov);
|
|
||||||
//const float focal_length = 1.0f / tan(fov_rad * 0.5f);
|
|
||||||
|
|
||||||
//camera.projMatrix(0,0) = focal_length / camera.GetAspectRatio();
|
|
||||||
//camera.projMatrix(1,1) = -focal_length;
|
|
||||||
//camera.projMatrix(2,2) = camera.zNear / (camera.zFar - camera.zNear);
|
|
||||||
//camera.projMatrix(2,3) = camera.zFar * (camera.zNear / (camera.zFar - camera.zNear));
|
|
||||||
//camera.projMatrix(3,2) = -1.0f;
|
|
||||||
//camera.projMatrix(3,3) = 0.0f;
|
|
||||||
|
|
||||||
//camera.projMatrix = SHMatrix::Inverse(camera.projMatrix);
|
|
||||||
|
|
||||||
camera.dirtyProj = false;
|
camera.dirtyProj = false;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
const float R = camera.width * 0.5f;
|
//const float R = camera.width * 0.5f;
|
||||||
const float L = -R;
|
//const float L = -R;
|
||||||
const float T = camera.height * 0.5f;
|
//const float T = camera.height * 0.5f;
|
||||||
const float B = -T;
|
//const float B = -T;
|
||||||
|
|
||||||
camera.projMatrix = SHMatrix::Identity;
|
//camera.projMatrix = SHMatrix::Identity;
|
||||||
camera.projMatrix(0, 0) = 2.0f / (R - L);
|
//camera.projMatrix(0, 0) = 2.0f / (R - L);
|
||||||
camera.projMatrix(1, 1) = 2.0f / (B - T);
|
//camera.projMatrix(1, 1) = 2.0f / (B - T);
|
||||||
camera.projMatrix(2, 2) = 1.0f / (camera.zFar - camera.zNear);
|
//camera.projMatrix(2, 2) = 1.0f / (camera.zFar - camera.zNear);
|
||||||
camera.projMatrix(3, 0) = -(R + L) / (R - L);
|
//camera.projMatrix(3, 0) = -(R + L) / (R - L);
|
||||||
camera.projMatrix(3, 1) = -(B + T) / (B - T);
|
//camera.projMatrix(3, 1) = -(B + T) / (B - T);
|
||||||
camera.projMatrix(3, 2) = -camera.zNear / (camera.zFar - camera.zNear);
|
//camera.projMatrix(3, 2) = -camera.zNear / (camera.zFar - camera.zNear);
|
||||||
|
|
||||||
camera.dirtyProj = false;
|
camera.dirtyProj = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void SHCameraSystem::GetCameraAxis(SHCameraComponent const& camera, SHVec3& forward, SHVec3& right, SHVec3& upVec) const noexcept
|
||||||
|
{
|
||||||
|
SHVec3 target{ 0.0f,0.0f,-1.0f };
|
||||||
|
SHVec3 up = { 0.0f,1.0f,0.0f };
|
||||||
|
|
||||||
|
|
||||||
|
target = SHVec3::RotateY(target, SHMath::DegreesToRadians(camera.yaw));
|
||||||
|
target =SHVec3::RotateX(target, SHMath::DegreesToRadians(camera.pitch));
|
||||||
|
std::cout << "Target vec: " << target.x<<", "<<target.y<<", "<<target.z << std::endl;
|
||||||
|
target += camera.position;
|
||||||
|
////SHVec3::RotateZ(target, SHMath::DegreesToRadians(camera.roll));
|
||||||
|
|
||||||
|
//target = SHVec3::Normalise(target);
|
||||||
|
|
||||||
|
SHVec3::RotateZ(up, camera.roll);
|
||||||
|
up = SHVec3::Normalise(up);
|
||||||
|
|
||||||
|
|
||||||
|
forward = target - camera.position; forward = SHVec3::Normalise(forward);
|
||||||
|
right = SHVec3::Cross(forward, up); right = SHVec3::Normalise(right);
|
||||||
|
upVec = SHVec3::Cross(forward, right);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,6 +40,8 @@ namespace SHADE
|
||||||
|
|
||||||
void UpdateCameraComponent(SHCameraComponent& camera) noexcept;
|
void UpdateCameraComponent(SHCameraComponent& camera) noexcept;
|
||||||
|
|
||||||
|
void GetCameraAxis(SHCameraComponent const& camera, SHVec3& forward, SHVec3& right, SHVec3& up) const noexcept;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -48,6 +48,9 @@ namespace SHADE
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
//Whether or not this component is active.
|
//Whether or not this component is active.
|
||||||
//Systems using this component should are responsible for checking the active state of the component before running their functionality.
|
//Systems using this component should are responsible for checking the active state of the component before running their functionality.
|
||||||
|
@ -59,7 +62,7 @@ namespace SHADE
|
||||||
* \return uint32_t
|
* \return uint32_t
|
||||||
* The entityID that this component belongs to.
|
* The entityID that this component belongs to.
|
||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
uint32_t GetEID()const
|
uint32_t GetEID()const noexcept
|
||||||
{
|
{
|
||||||
return this->entityID;
|
return this->entityID;
|
||||||
}
|
}
|
||||||
|
|
|
@ -115,34 +115,22 @@ namespace SHADE
|
||||||
/*---------------------------------------------------------------------------------*/
|
/*---------------------------------------------------------------------------------*/
|
||||||
/* Script Serialisation Functions */
|
/* Script Serialisation Functions */
|
||||||
/*---------------------------------------------------------------------------------*/
|
/*---------------------------------------------------------------------------------*/
|
||||||
std::string SHScriptEngine::SerialiseScripts(EntityID entity) const
|
bool SHScriptEngine::SerialiseScripts(EntityID entity, YAML::Node& scriptsNode) const
|
||||||
{
|
{
|
||||||
// Create buffer needed to store serialised script data
|
|
||||||
constexpr int BUFFER_SIZE = 10240;
|
|
||||||
std::unique_ptr<char> buffer { new char[BUFFER_SIZE] };
|
|
||||||
std::memset(buffer.get(), 0, BUFFER_SIZE);
|
|
||||||
|
|
||||||
// Attempt to serialise the script
|
// Attempt to serialise the script
|
||||||
std::string result;
|
if (csScriptsSerialiseYaml(entity, &scriptsNode))
|
||||||
if (csScriptsSerialise(entity, buffer.get(), BUFFER_SIZE))
|
return true;
|
||||||
{
|
|
||||||
result = std::string(buffer.get());
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
SHLOG_ERROR("[ScriptEngine] Failed to serialise scripts as string buffer is too small!");
|
|
||||||
}
|
|
||||||
|
|
||||||
// Return an empty string since we failed to serialise
|
SHLOG_ERROR("[ScriptEngine] Failed to serialise scripts for entity #{}.", entity);
|
||||||
return result;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*-----------------------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------------------*/
|
||||||
/* Script Serialisation Functions */
|
/* Script Serialisation Functions */
|
||||||
/*-----------------------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------------------*/
|
||||||
void SHScriptEngine::DeserialiseScript(EntityID entity, const std::string& yaml) const
|
bool SHScriptEngine::DeserialiseScripts(EntityID entity, const YAML::Node& scriptsNode) const
|
||||||
{
|
{
|
||||||
csScriptDeserialise(entity, yaml.c_str());
|
return csScriptsDeserialiseYaml(entity, &scriptsNode);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*-----------------------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------------------*/
|
||||||
|
@ -380,30 +368,18 @@ namespace SHADE
|
||||||
DEFAULT_CSHARP_NAMESPACE + ".ScriptStore",
|
DEFAULT_CSHARP_NAMESPACE + ".ScriptStore",
|
||||||
"RemoveAllScriptsImmediately"
|
"RemoveAllScriptsImmediately"
|
||||||
);
|
);
|
||||||
/*csScriptsSerialise = dotNet.GetFunctionPtr<CsScriptSerialiseFuncPtr>
|
csScriptsSerialiseYaml = dotNet.GetFunctionPtr<CsScriptSerialiseYamlFuncPtr>
|
||||||
(
|
(
|
||||||
DEFAULT_CSHARP_LIB_NAME,
|
DEFAULT_CSHARP_LIB_NAME,
|
||||||
DEFAULT_CSHARP_NAMESPACE + ".ScriptStore",
|
DEFAULT_CSHARP_NAMESPACE + ".ScriptStore",
|
||||||
"SerialiseScripts"
|
"SerialiseScripts"
|
||||||
);
|
);
|
||||||
csScriptsSerialiseYaml = dotNet.GetFunctionPtr<CsScriptSerialiseYamlFuncPtr>
|
csScriptsDeserialiseYaml = dotNet.GetFunctionPtr<CsScriptDeserialiseYamlFuncPtr>
|
||||||
(
|
(
|
||||||
DEFAULT_CSHARP_LIB_NAME,
|
DEFAULT_CSHARP_LIB_NAME,
|
||||||
DEFAULT_CSHARP_NAMESPACE + ".ScriptStore",
|
DEFAULT_CSHARP_NAMESPACE + ".ScriptStore",
|
||||||
"SerialiseScriptsYaml"
|
"DeserialiseScripts"
|
||||||
);
|
);
|
||||||
csScriptDeserialise = dotNet.GetFunctionPtr<CsScriptDeserialiseFuncPtr>
|
|
||||||
(
|
|
||||||
DEFAULT_CSHARP_LIB_NAME,
|
|
||||||
DEFAULT_CSHARP_NAMESPACE + ".ScriptStore",
|
|
||||||
"DeserialiseScript"
|
|
||||||
);
|
|
||||||
csScriptDeserialiseYaml = dotNet.GetFunctionPtr<CsScriptSerialiseYamlFuncPtr>
|
|
||||||
(
|
|
||||||
DEFAULT_CSHARP_LIB_NAME,
|
|
||||||
DEFAULT_CSHARP_NAMESPACE + ".ScriptStore",
|
|
||||||
"SerialiseScriptsYaml"
|
|
||||||
);*/
|
|
||||||
csEditorRenderScripts = dotNet.GetFunctionPtr<CsScriptEditorFuncPtr>
|
csEditorRenderScripts = dotNet.GetFunctionPtr<CsScriptEditorFuncPtr>
|
||||||
(
|
(
|
||||||
DEFAULT_CSHARP_LIB_NAME,
|
DEFAULT_CSHARP_LIB_NAME,
|
||||||
|
|
|
@ -13,7 +13,8 @@ of DigiPen Institute of Technology is prohibited.
|
||||||
|
|
||||||
// STL Includes
|
// STL Includes
|
||||||
#include <filesystem>
|
#include <filesystem>
|
||||||
|
// External Dependencies
|
||||||
|
#include <yaml-cpp/yaml.h>
|
||||||
// Project Headers
|
// Project Headers
|
||||||
#include "SH_API.h"
|
#include "SH_API.h"
|
||||||
#include "SHDotNetRuntime.h"
|
#include "SHDotNetRuntime.h"
|
||||||
|
@ -141,23 +142,26 @@ namespace SHADE
|
||||||
/* Script Serialisation Functions */
|
/* Script Serialisation Functions */
|
||||||
/*-----------------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------------*/
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Generates a JSON string that represents the set of Scripts attached to the
|
/// Performs serialization of all scripts for the specified entity into the
|
||||||
/// specified Entity.
|
/// YAML::Node specified. This node will contain all serialised scripts after
|
||||||
|
/// calling this function.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="entity"> The Entity to Serialise.</param>
|
/// <param name="entity">The Entity to Serialise.</param>
|
||||||
/// <returns>
|
/// <param name="scriptsNode">
|
||||||
/// String that represents the set of scripts attached to the specified Entity.
|
/// YAML Node that will store the serialised scripts.
|
||||||
/// </returns>
|
/// </param>
|
||||||
std::string SerialiseScripts(EntityID entity) const;
|
/// <return>True if successfully serialised.</return>
|
||||||
|
bool SerialiseScripts(EntityID entity, YAML::Node& scriptsNode) const;
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Loads the specified JSON string and creates a Script for the specified Entity
|
/// Creates scripts and sets fields for the specified Entity based on the specified
|
||||||
/// based on the specified JSON string.
|
/// YAML node.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="entity">The Entity to deserialise a Script on to.</param>
|
/// <param name="entity">The Entity to deserialise a Script on to.</param>
|
||||||
/// <param name="yaml">
|
/// <param name="scriptsNode">
|
||||||
/// The YAML string that represents the Script to load into the Entity.
|
/// YAML Node that contains the serialised script data.
|
||||||
/// </param>
|
/// </param>
|
||||||
void DeserialiseScript(EntityID entity, const std::string& yaml) const;
|
/// <return>True if successfully deserialised.</return>
|
||||||
|
bool DeserialiseScripts(EntityID entity, const YAML::Node& scriptsNode) const;
|
||||||
|
|
||||||
/*-----------------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------------*/
|
||||||
/* Script Editor Functions */
|
/* Script Editor Functions */
|
||||||
|
@ -207,14 +211,13 @@ namespace SHADE
|
||||||
/*-----------------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------------*/
|
||||||
/* Type Definitions */
|
/* Type Definitions */
|
||||||
/*-----------------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------------*/
|
||||||
using CsFuncPtr = void(*)(void);
|
using CsFuncPtr = void(*)(void);
|
||||||
using CsScriptManipFuncPtr = bool(*)(EntityID, const char*);
|
using CsScriptManipFuncPtr = bool(*)(EntityID, const char*);
|
||||||
using CsScriptBasicFuncPtr = void(*)(EntityID);
|
using CsScriptBasicFuncPtr = void(*)(EntityID);
|
||||||
using CsScriptOptionalFuncPtr = void(*)(EntityID, bool);
|
using CsScriptOptionalFuncPtr = void(*)(EntityID, bool);
|
||||||
using CsScriptSerialiseFuncPtr = bool(*)(EntityID, char*, int);
|
using CsScriptSerialiseYamlFuncPtr = bool(*)(EntityID, void*);
|
||||||
using CsScriptDeserialiseFuncPtr = bool(*)(EntityID, const char*);
|
using CsScriptDeserialiseYamlFuncPtr = bool(*)(EntityID, const void*);
|
||||||
using CsScriptSerialiseYamlFuncPtr = bool(*)(EntityID, void*);
|
using CsScriptEditorFuncPtr = void(*)(EntityID);
|
||||||
using CsScriptEditorFuncPtr = void(*)(EntityID);
|
|
||||||
|
|
||||||
/*-----------------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------------*/
|
||||||
/* Constants */
|
/* Constants */
|
||||||
|
@ -228,31 +231,29 @@ namespace SHADE
|
||||||
/*-----------------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------------*/
|
||||||
/* Data Members */
|
/* Data Members */
|
||||||
/*-----------------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------------*/
|
||||||
SHDotNetRuntime dotNet { false };
|
SHDotNetRuntime dotNet { false };
|
||||||
// Function Pointers to CLR Code
|
// Function Pointers to CLR Code
|
||||||
// - Engine Lifecycle
|
// - Engine Lifecycle
|
||||||
CsFuncPtr csEngineInit = nullptr;
|
CsFuncPtr csEngineInit = nullptr;
|
||||||
CsFuncPtr csEngineLoadScripts = nullptr;
|
CsFuncPtr csEngineLoadScripts = nullptr;
|
||||||
CsFuncPtr csEngineUnloadScripts = nullptr;
|
CsFuncPtr csEngineUnloadScripts = nullptr;
|
||||||
CsFuncPtr csEngineReloadScripts = nullptr;
|
CsFuncPtr csEngineReloadScripts = nullptr;
|
||||||
CsFuncPtr csEngineExit = nullptr;
|
CsFuncPtr csEngineExit = nullptr;
|
||||||
// - Scripts Store
|
// - Scripts Store
|
||||||
CsFuncPtr csScriptsFrameSetUp = nullptr;
|
CsFuncPtr csScriptsFrameSetUp = nullptr;
|
||||||
CsFuncPtr csScriptsExecuteFixedUpdate = nullptr;
|
CsFuncPtr csScriptsExecuteFixedUpdate = nullptr;
|
||||||
CsFuncPtr csScriptsExecuteUpdate = nullptr;
|
CsFuncPtr csScriptsExecuteUpdate = nullptr;
|
||||||
CsFuncPtr csScriptsExecuteLateUpdate = nullptr;
|
CsFuncPtr csScriptsExecuteLateUpdate = nullptr;
|
||||||
CsFuncPtr csScriptsFrameCleanUp = nullptr;
|
CsFuncPtr csScriptsFrameCleanUp = nullptr;
|
||||||
CsScriptManipFuncPtr csScriptsAdd = nullptr;
|
CsScriptManipFuncPtr csScriptsAdd = nullptr;
|
||||||
CsScriptBasicFuncPtr csScriptsRemoveAll = nullptr;
|
CsScriptBasicFuncPtr csScriptsRemoveAll = nullptr;
|
||||||
CsScriptOptionalFuncPtr csScriptsRemoveAllImmediately = nullptr;
|
CsScriptOptionalFuncPtr csScriptsRemoveAllImmediately = nullptr;
|
||||||
CsScriptSerialiseFuncPtr csScriptsSerialise = nullptr;
|
CsScriptSerialiseYamlFuncPtr csScriptsSerialiseYaml = nullptr;
|
||||||
CsScriptDeserialiseFuncPtr csScriptDeserialise = nullptr;
|
CsScriptDeserialiseYamlFuncPtr csScriptsDeserialiseYaml = nullptr;
|
||||||
CsScriptSerialiseYamlFuncPtr csScriptsSerialiseYaml = nullptr;
|
|
||||||
CsScriptSerialiseYamlFuncPtr csScriptDeserialiseYaml = nullptr;
|
|
||||||
// - Editor
|
// - Editor
|
||||||
CsScriptEditorFuncPtr csEditorRenderScripts = nullptr;
|
CsScriptEditorFuncPtr csEditorRenderScripts = nullptr;
|
||||||
CsFuncPtr csEditorUndo = nullptr;
|
CsFuncPtr csEditorUndo = nullptr;
|
||||||
CsFuncPtr csEditorRedo = nullptr;
|
CsFuncPtr csEditorRedo = nullptr;
|
||||||
|
|
||||||
/*-----------------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------------*/
|
||||||
/* Event Handler Functions */
|
/* Event Handler Functions */
|
||||||
|
|
|
@ -13,6 +13,8 @@
|
||||||
#include "Graphics/MiddleEnd/Interface/SHRenderable.h"
|
#include "Graphics/MiddleEnd/Interface/SHRenderable.h"
|
||||||
#include "Math/Transform/SHTransformComponent.h"
|
#include "Math/Transform/SHTransformComponent.h"
|
||||||
#include "Physics/Components/SHRigidBodyComponent.h"
|
#include "Physics/Components/SHRigidBodyComponent.h"
|
||||||
|
#include "ECS_Base/Managers/SHSystemManager.h"
|
||||||
|
#include "Scripting/SHScriptEngine.h"
|
||||||
|
|
||||||
namespace SHADE
|
namespace SHADE
|
||||||
{
|
{
|
||||||
|
@ -77,6 +79,10 @@ namespace SHADE
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Deserialise scripts
|
||||||
|
if (node[ScriptsNode])
|
||||||
|
SHSystemManager::GetSystem<SHScriptEngine>()->DeserialiseScripts(eid, node[ScriptsNode]);
|
||||||
}
|
}
|
||||||
|
|
||||||
void SHSerialization::DeserializeSceneFromFile(std::filesystem::path const& path)
|
void SHSerialization::DeserializeSceneFromFile(std::filesystem::path const& path)
|
||||||
|
@ -157,7 +163,7 @@ namespace SHADE
|
||||||
node = YAML::Null;
|
node = YAML::Null;
|
||||||
return node;
|
return node;
|
||||||
}
|
}
|
||||||
node.SetStyle(YAML::EmitterStyle::Block);
|
node.SetStyle(YAML::EmitterStyle::Block);
|
||||||
node[EIDNode] = eid;
|
node[EIDNode] = eid;
|
||||||
node[EntityNameNode] = entity->name;
|
node[EntityNameNode] = entity->name;
|
||||||
node[IsActiveNode] = sceneNode->IsActive();
|
node[IsActiveNode] = sceneNode->IsActive();
|
||||||
|
@ -179,6 +185,11 @@ namespace SHADE
|
||||||
components[rttr::type::get<SHRigidBodyComponent>().get_name().data()] = SHSerializationHelper::SerializeComponentToNode(rigidbody);
|
components[rttr::type::get<SHRigidBodyComponent>().get_name().data()] = SHSerializationHelper::SerializeComponentToNode(rigidbody);
|
||||||
}
|
}
|
||||||
node[ComponentsNode] = components;
|
node[ComponentsNode] = components;
|
||||||
|
|
||||||
|
YAML::Node scripts;
|
||||||
|
SHSystemManager::GetSystem<SHScriptEngine>()->SerialiseScripts(eid, scripts);
|
||||||
|
node[ScriptsNode] = scripts;
|
||||||
|
|
||||||
return node;
|
return node;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -21,6 +21,7 @@ namespace SHADE
|
||||||
constexpr const char* EIDNode = "EID";
|
constexpr const char* EIDNode = "EID";
|
||||||
constexpr const char* IsActiveNode = "IsActive";
|
constexpr const char* IsActiveNode = "IsActive";
|
||||||
constexpr const char* NumberOfChildrenNode = "NumberOfChildren";
|
constexpr const char* NumberOfChildrenNode = "NumberOfChildren";
|
||||||
|
constexpr const char* ScriptsNode = "Scripts";
|
||||||
|
|
||||||
struct SH_API SHSerialization
|
struct SH_API SHSerialization
|
||||||
{
|
{
|
||||||
|
|
|
@ -26,6 +26,7 @@ of DigiPen Institute of Technology is prohibited.
|
||||||
#include "Utility/Convert.hxx"
|
#include "Utility/Convert.hxx"
|
||||||
#include "Script.hxx"
|
#include "Script.hxx"
|
||||||
#include "Engine/Entity.hxx"
|
#include "Engine/Entity.hxx"
|
||||||
|
#include "Serialisation/ReflectionUtilities.hxx"
|
||||||
|
|
||||||
namespace SHADE
|
namespace SHADE
|
||||||
{
|
{
|
||||||
|
@ -470,72 +471,90 @@ namespace SHADE
|
||||||
}
|
}
|
||||||
SAFE_NATIVE_CALL_END_N("SHADE.ScriptStore")
|
SAFE_NATIVE_CALL_END_N("SHADE.ScriptStore")
|
||||||
}
|
}
|
||||||
bool ScriptStore::SerialiseScripts(Entity entity, System::Text::StringBuilder^ buffer, int bufferSize)
|
|
||||||
|
bool ScriptStore::SerialiseScripts(Entity entity, System::IntPtr yamlNodePtr)
|
||||||
{
|
{
|
||||||
SAFE_NATIVE_CALL_BEGIN
|
SAFE_NATIVE_CALL_BEGIN
|
||||||
// Create a buffer that we can work with temporarily
|
// Convert to pointer
|
||||||
System::Text::StringBuilder^ jsonString = gcnew System::Text::StringBuilder();
|
YAML::Node* yamlNode = reinterpret_cast<YAML::Node*>(yamlNodePtr.ToPointer());
|
||||||
|
|
||||||
|
// Check if yamlNode is valid
|
||||||
|
if (yamlNode == nullptr)
|
||||||
|
{
|
||||||
|
Debug::LogWarning("[ScriptStore] Attempted to serialise scripts with an invalid YAML Node! Skipping.");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if entity exists, otherwise nothing
|
// Check if entity exists, otherwise nothing
|
||||||
if (!EntityUtils::IsValid(entity))
|
if (!EntityUtils::IsValid(entity))
|
||||||
return true;
|
{
|
||||||
|
Debug::LogWarning("[ScriptStore] Attempted to serialise scripts for an invalid Entity! Skipping.");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if entity exists in the script storage
|
// Check if entity exists in the script storage
|
||||||
if (!scripts.ContainsKey(entity))
|
if (!scripts.ContainsKey(entity))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
// Serialise each script
|
// Serialise each script
|
||||||
|
yamlNode->SetStyle(YAML::EmitterStyle::Block);
|
||||||
System::Collections::Generic::List<Script^>^ scriptList = scripts[entity];
|
System::Collections::Generic::List<Script^>^ scriptList = scripts[entity];
|
||||||
for (int i = 0; i < scriptList->Count; ++i)
|
for each (Script^ script in scriptList)
|
||||||
{
|
{
|
||||||
throw gcnew System::NotImplementedException;
|
ReflectionUtilities::Serialise(script, *yamlNode);
|
||||||
//jsonString->Append(ReflectionUtilities::Serialise(scriptList[i]));
|
|
||||||
|
|
||||||
// Only add separator if is not last script
|
|
||||||
if (i != scriptList->Count - 1)
|
|
||||||
{
|
|
||||||
jsonString->Append(",\r\n");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if the size is too big
|
|
||||||
if (jsonString->Length > bufferSize)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
// Otherwise we copy it over
|
|
||||||
buffer->Clear();
|
|
||||||
buffer->Append(jsonString->ToString());
|
|
||||||
return true;
|
return true;
|
||||||
SAFE_NATIVE_CALL_END_N("SHADE.ScriptStore")
|
SAFE_NATIVE_CALL_END_N("SHADE.ScriptStore")
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ScriptStore::DeserialiseScript(Entity entity, System::String^ yaml)
|
bool ScriptStore::DeserialiseScripts(Entity entity, System::IntPtr yamlNodePtr)
|
||||||
{
|
{
|
||||||
SAFE_NATIVE_CALL_BEGIN
|
SAFE_NATIVE_CALL_BEGIN
|
||||||
|
// Convert to pointer
|
||||||
|
YAML::Node* yamlNode = reinterpret_cast<YAML::Node*>(yamlNodePtr.ToPointer());
|
||||||
|
|
||||||
|
// Check if yamlNode is valid
|
||||||
|
if (yamlNode == nullptr)
|
||||||
|
{
|
||||||
|
Debug::LogWarning("[ScriptStore] Attempted to deserialise scripts with an invalid YAML Node! Skipping.");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check if entity exists, otherwise nothing
|
// Check if entity exists, otherwise nothing
|
||||||
if (!EntityUtils::IsValid(entity))
|
if (!EntityUtils::IsValid(entity))
|
||||||
return false;
|
|
||||||
|
|
||||||
// Get the name of the script
|
|
||||||
const int FIRST_QUOTE = yaml->IndexOf('\"');
|
|
||||||
const int FIRST_COLON = yaml->IndexOf(':');
|
|
||||||
if (FIRST_QUOTE < 0 || FIRST_COLON < 0) // No script name, it's invalid
|
|
||||||
return false;
|
|
||||||
const int SCRIPT_NAME_START = FIRST_QUOTE + 1;
|
|
||||||
const int SCRIPT_NAME_END = FIRST_COLON - 1;
|
|
||||||
System::String^ typeName = yaml->Substring(SCRIPT_NAME_START, SCRIPT_NAME_END - SCRIPT_NAME_START);
|
|
||||||
|
|
||||||
// Create the script
|
|
||||||
Script^ script;
|
|
||||||
if (AddScriptViaNameWithRef(entity, typeName, script))
|
|
||||||
{
|
{
|
||||||
// Copy the data in
|
Debug::LogWarning("[ScriptStore] Attempted to deserialise scripts for an invalid Entity! Skipping.");
|
||||||
throw gcnew System::NotImplementedException;
|
return false;
|
||||||
//ReflectionUtilities::Deserialise(json, script);
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Go through all elements in the node
|
||||||
|
for (YAML::Node& node : *yamlNode)
|
||||||
|
{
|
||||||
|
// Get the name of the script
|
||||||
|
if (!node["Type"])
|
||||||
|
{
|
||||||
|
Debug::LogWarning("[ScriptStore] Script with no type detected, skipping.");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
System::String^ typeName = Convert::ToCLI(node["Type"].as<std::string>());
|
||||||
|
|
||||||
|
// Create
|
||||||
|
Script^ script;
|
||||||
|
if (AddScriptViaNameWithRef(entity, typeName, script))
|
||||||
|
{
|
||||||
|
// Copy the data in
|
||||||
|
ReflectionUtilities::Deserialise(script, node);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Debug::LogWarning("[ScriptStore] Script with unloaded type detected, skipping.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
|
||||||
SAFE_NATIVE_CALL_END_N("SHADE.ScriptStore")
|
SAFE_NATIVE_CALL_END_N("SHADE.ScriptStore")
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,6 +17,7 @@ of DigiPen Institute of Technology is prohibited.
|
||||||
// Project Includes
|
// Project Includes
|
||||||
#include "Engine/Entity.hxx"
|
#include "Engine/Entity.hxx"
|
||||||
#include "Script.hxx"
|
#include "Script.hxx"
|
||||||
|
#include "Serialization/SHSerialization.h"
|
||||||
|
|
||||||
namespace SHADE
|
namespace SHADE
|
||||||
{
|
{
|
||||||
|
@ -237,27 +238,23 @@ namespace SHADE
|
||||||
/* Serialisation Functions */
|
/* Serialisation Functions */
|
||||||
/*-----------------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------------*/
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Generates a JSON string that represents the set of Scripts attached
|
/// Populates a YAML node with the scripts for a specified Entity.
|
||||||
/// to the specified Entity.
|
|
||||||
/// <br/> <br/>
|
/// <br/> <br/>
|
||||||
/// This function should only be called from native unmanaged code.
|
/// This function should only be called from native unmanaged code.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="entity">The Entity to Serialise.</param>
|
/// <param name="entity">The Entity to Serialise.</param>
|
||||||
/// <param name="buffer">
|
/// <param name="yamlNode">
|
||||||
/// StringBuilder handle that maps to a native char array that will contain the
|
/// Pointer to a YAML::Node that will be populated with all of the serialised
|
||||||
/// serialised string.
|
/// scripts and their associated fields.
|
||||||
/// </param>
|
|
||||||
/// <param name="bufferSize">
|
|
||||||
/// The size of the char array.
|
|
||||||
/// </param>
|
/// </param>
|
||||||
/// <returns>
|
/// <returns>
|
||||||
/// True if serialisation is successful. False if the buffer is too small for
|
/// True if serialisation is successful. False if the buffer is too small for
|
||||||
/// the serialised output.
|
/// the serialised output.
|
||||||
/// </returns>
|
/// </returns>
|
||||||
static bool SerialiseScripts(Entity entity, System::Text::StringBuilder^ buffer, int bufferSize);
|
static bool SerialiseScripts(Entity entity, System::IntPtr yamlNode);
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Processes a JSON string that represents a single Script and attaches
|
/// Processes a YAML node that contains a list of multiple scripts to be loaded
|
||||||
/// it onto the specified Entity.
|
/// into the specified Entity.
|
||||||
/// <br/> <br/>
|
/// <br/> <br/>
|
||||||
/// This function should only be called from native unmanaged code.
|
/// This function should only be called from native unmanaged code.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -265,10 +262,10 @@ namespace SHADE
|
||||||
/// The Entity to attach the deserialised Scripts to.
|
/// The Entity to attach the deserialised Scripts to.
|
||||||
/// </param>
|
/// </param>
|
||||||
/// <param name="yaml">
|
/// <param name="yaml">
|
||||||
/// JSON string that describes the Script to serialise.
|
/// Pointer to the YAML::Node that contains serialized script data.
|
||||||
/// </param>
|
/// </param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
static bool DeserialiseScript(Entity entity, System::String^ yaml);
|
static bool DeserialiseScripts(Entity entity, System::IntPtr yamlNode);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
/*-----------------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------------*/
|
||||||
|
|
|
@ -38,6 +38,11 @@ if (iter != jsonValue.MemberEnd()) \
|
||||||
vec.MEMBER = iter->value.GetDouble(); \
|
vec.MEMBER = iter->value.GetDouble(); \
|
||||||
} \
|
} \
|
||||||
|
|
||||||
|
/*-------------------------------------------------------------------------------------*/
|
||||||
|
/* File-Level Constants */
|
||||||
|
/*-------------------------------------------------------------------------------------*/
|
||||||
|
static const std::string_view SCRIPT_TYPE_YAMLTAG = "Type";
|
||||||
|
|
||||||
/*-------------------------------------------------------------------------------------*/
|
/*-------------------------------------------------------------------------------------*/
|
||||||
/* Function Definitions */
|
/* Function Definitions */
|
||||||
/*-------------------------------------------------------------------------------------*/
|
/*-------------------------------------------------------------------------------------*/
|
||||||
|
@ -61,13 +66,14 @@ namespace SHADE
|
||||||
/*---------------------------------------------------------------------------------*/
|
/*---------------------------------------------------------------------------------*/
|
||||||
/* Serialisation Functions */
|
/* Serialisation Functions */
|
||||||
/*---------------------------------------------------------------------------------*/
|
/*---------------------------------------------------------------------------------*/
|
||||||
void ReflectionUtilities::Serialise(System::Object^ object, YAML::Emitter& yaml)
|
void ReflectionUtilities::Serialise(System::Object^ object, YAML::Node& scriptListNode)
|
||||||
{
|
{
|
||||||
using namespace System::Reflection;
|
using namespace System::Reflection;
|
||||||
|
|
||||||
// Create YAML object
|
// Create YAML object
|
||||||
yaml << YAML::Key << Convert::ToNative(object->GetType()->FullName);
|
YAML::Node scriptNode;
|
||||||
yaml << YAML::BeginMap;
|
scriptNode.SetStyle(YAML::EmitterStyle::Block);
|
||||||
|
scriptNode[SCRIPT_TYPE_YAMLTAG.data()] = Convert::ToNative(object->GetType()->FullName);
|
||||||
|
|
||||||
// Get all fields
|
// Get all fields
|
||||||
System::Collections::Generic::IEnumerable<FieldInfo^>^ fields = GetInstanceFields(object);
|
System::Collections::Generic::IEnumerable<FieldInfo^>^ fields = GetInstanceFields(object);
|
||||||
|
@ -78,12 +84,12 @@ namespace SHADE
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
// Serialise
|
// Serialise
|
||||||
writeFieldIntoYaml(field, object, yaml);
|
writeFieldIntoYaml(field, object, scriptNode);
|
||||||
}
|
}
|
||||||
|
|
||||||
yaml << YAML::EndMap;
|
scriptListNode.push_back(scriptNode);
|
||||||
}
|
}
|
||||||
void ReflectionUtilities::Deserialise(YAML::Node& yamlNode, Object^ object)
|
void ReflectionUtilities::Deserialise(Object^ object, YAML::Node& yamlNode)
|
||||||
{
|
{
|
||||||
using namespace System::Reflection;
|
using namespace System::Reflection;
|
||||||
|
|
||||||
|
@ -117,53 +123,63 @@ namespace SHADE
|
||||||
/*---------------------------------------------------------------------------------*/
|
/*---------------------------------------------------------------------------------*/
|
||||||
/* Serialization Helper Functions */
|
/* Serialization Helper Functions */
|
||||||
/*---------------------------------------------------------------------------------*/
|
/*---------------------------------------------------------------------------------*/
|
||||||
void ReflectionUtilities::writeFieldIntoYaml(System::Reflection::FieldInfo^ fieldInfo, Object^ object, YAML::Emitter& yaml)
|
void ReflectionUtilities::writeFieldIntoYaml(System::Reflection::FieldInfo^ fieldInfo, Object^ object, YAML::Node& yamlNode)
|
||||||
{
|
{
|
||||||
// Field Name
|
// Field YAML Node
|
||||||
yaml << YAML::Key << Convert::ToNative(fieldInfo->Name);
|
YAML::Node fieldNode;
|
||||||
|
|
||||||
// Field Value
|
// Retrieve string for the YAML
|
||||||
yaml << YAML::Value;
|
const bool PRIMITIVE_SERIALIZED = fieldInsertYaml<System::Int16>(fieldInfo, object, fieldNode) ||
|
||||||
if (fieldInsertYaml<System::Int16> (fieldInfo, object, yaml) ||
|
fieldInsertYaml<System::Int32>(fieldInfo, object, fieldNode) ||
|
||||||
fieldInsertYaml<System::Int32> (fieldInfo, object, yaml) ||
|
fieldInsertYaml<System::Int64>(fieldInfo, object, fieldNode) ||
|
||||||
fieldInsertYaml<System::Int64> (fieldInfo, object, yaml) ||
|
fieldInsertYaml<System::UInt16>(fieldInfo, object, fieldNode) ||
|
||||||
fieldInsertYaml<System::UInt16>(fieldInfo, object, yaml) ||
|
fieldInsertYaml<System::UInt32>(fieldInfo, object, fieldNode) ||
|
||||||
fieldInsertYaml<System::UInt32>(fieldInfo, object, yaml) ||
|
fieldInsertYaml<System::UInt64>(fieldInfo, object, fieldNode) ||
|
||||||
fieldInsertYaml<System::UInt64>(fieldInfo, object, yaml) ||
|
fieldInsertYaml<System::Byte>(fieldInfo, object, fieldNode) ||
|
||||||
fieldInsertYaml<System::Byte> (fieldInfo, object, yaml) ||
|
fieldInsertYaml<bool>(fieldInfo, object, fieldNode) ||
|
||||||
fieldInsertYaml<bool> (fieldInfo, object, yaml) ||
|
fieldInsertYaml<float>(fieldInfo, object, fieldNode) ||
|
||||||
fieldInsertYaml<float> (fieldInfo, object, yaml) ||
|
fieldInsertYaml<double>(fieldInfo, object, fieldNode);
|
||||||
fieldInsertYaml<double> (fieldInfo, object, yaml))
|
|
||||||
|
// Serialization of more complex types
|
||||||
|
if (!PRIMITIVE_SERIALIZED)
|
||||||
{
|
{
|
||||||
return;
|
if (fieldInfo->FieldType->IsSubclassOf(System::Enum::typeid))
|
||||||
}
|
{
|
||||||
else if (fieldInfo->FieldType->IsSubclassOf(System::Enum::typeid))
|
fieldNode = std::to_string(safe_cast<int>(fieldInfo->GetValue(object)));
|
||||||
{
|
}
|
||||||
yaml << safe_cast<int>(fieldInfo->GetValue(object));
|
else if (fieldInfo->FieldType == System::String::typeid)
|
||||||
}
|
{
|
||||||
else if (fieldInfo->FieldType == System::String::typeid)
|
System::String^ str = safe_cast<System::String^>(fieldInfo->GetValue(object));
|
||||||
{
|
fieldNode = Convert::ToNative(str);
|
||||||
System::String^ str = safe_cast<System::String^>(fieldInfo->GetValue(object));
|
}
|
||||||
yaml << Convert::ToNative(str);
|
else if (fieldInfo->FieldType == Vector2::typeid)
|
||||||
}
|
{
|
||||||
else if (fieldInfo->FieldType == Vector2::typeid)
|
Vector2 vec = safe_cast<Vector2>(fieldInfo->GetValue(object));
|
||||||
{
|
fieldNode.SetStyle(YAML::EmitterStyle::Flow);
|
||||||
Vector2 vec = safe_cast<Vector2>(fieldInfo->GetValue(object));
|
fieldNode.push_back(vec.x);
|
||||||
yaml << YAML::BeginSeq << YAML::Flow << vec.x << vec.y << YAML::EndSeq;
|
fieldNode.push_back(vec.y);
|
||||||
}
|
}
|
||||||
else if (fieldInfo->FieldType == Vector3::typeid)
|
else if (fieldInfo->FieldType == Vector3::typeid)
|
||||||
{
|
{
|
||||||
Vector3 vec = safe_cast<Vector3>(fieldInfo->GetValue(object));
|
Vector3 vec = safe_cast<Vector3>(fieldInfo->GetValue(object));
|
||||||
yaml << YAML::BeginSeq << YAML::Flow << vec.x << vec.y << vec.z << YAML::EndSeq;
|
fieldNode.SetStyle(YAML::EmitterStyle::Flow);
|
||||||
}
|
fieldNode.push_back(vec.x);
|
||||||
else // Not any of the supported types
|
fieldNode.push_back(vec.y);
|
||||||
{
|
fieldNode.push_back(vec.z);
|
||||||
Debug::LogWarning(Convert::ToNative(System::String::Format
|
}
|
||||||
(
|
else // Not any of the supported types
|
||||||
"[ReflectionUtilities] Failed to parse \"{0}\" of \"{1}\" type for serialization.",
|
{
|
||||||
fieldInfo->Name, fieldInfo->FieldType)
|
Debug::LogWarning(Convert::ToNative(System::String::Format
|
||||||
));
|
(
|
||||||
|
"[ReflectionUtilities] Failed to parse \"{0}\" of \"{1}\" type for serialization.",
|
||||||
|
fieldInfo->Name, fieldInfo->FieldType)
|
||||||
|
));
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Store the field into YAML
|
||||||
|
yamlNode[Convert::ToNative(fieldInfo->Name)] = fieldNode;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ReflectionUtilities::writeYamlIntoField(System::Reflection::FieldInfo^ fieldInfo, Object^ object, YAML::Node& node)
|
void ReflectionUtilities::writeYamlIntoField(System::Reflection::FieldInfo^ fieldInfo, Object^ object, YAML::Node& node)
|
||||||
|
|
|
@ -23,11 +23,12 @@ namespace SHADE
|
||||||
/* Serialization Helper Functions */
|
/* Serialization Helper Functions */
|
||||||
/*---------------------------------------------------------------------------------*/
|
/*---------------------------------------------------------------------------------*/
|
||||||
template<typename FieldType>
|
template<typename FieldType>
|
||||||
bool ReflectionUtilities::fieldInsertYaml(System::Reflection::FieldInfo^ fieldInfo, System::Object^ object, YAML::Emitter& emitter)
|
bool ReflectionUtilities::fieldInsertYaml(System::Reflection::FieldInfo^ fieldInfo, System::Object^ object, YAML::Node& fieldNode)
|
||||||
{
|
{
|
||||||
if (fieldInfo->FieldType == FieldType::typeid)
|
if (fieldInfo->FieldType == FieldType::typeid)
|
||||||
{
|
{
|
||||||
emitter << safe_cast<FieldType>(fieldInfo->GetValue(object));
|
const FieldType VALUE = safe_cast<FieldType>(fieldInfo->GetValue(object));
|
||||||
|
fieldNode = static_cast<FieldType>(VALUE);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -37,7 +38,7 @@ namespace SHADE
|
||||||
template<typename FieldType>
|
template<typename FieldType>
|
||||||
bool ReflectionUtilities::fieldAssignYaml(System::Reflection::FieldInfo^ fieldInfo, Object^ object, YAML::Node& node)
|
bool ReflectionUtilities::fieldAssignYaml(System::Reflection::FieldInfo^ fieldInfo, Object^ object, YAML::Node& node)
|
||||||
{
|
{
|
||||||
return fieldAssignYaml<FieldType, FieldType>(fieldInfo, object, node);
|
return fieldAssignYaml<FieldType, ToNativeType_T<FieldType>>(fieldInfo, object, node);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename FieldType, typename CastType>
|
template<typename FieldType, typename CastType>
|
||||||
|
|
|
@ -52,24 +52,24 @@ namespace SHADE
|
||||||
/// attribute will be serialised.
|
/// attribute will be serialised.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="object">The object to serialise.</param>
|
/// <param name="object">The object to serialise.</param>
|
||||||
static void Serialise(System::Object^ object, YAML::Emitter& yaml);
|
static void Serialise(System::Object^ object, YAML::Node& yamlNode);
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Deserialises a YAML node that contains a map of Scripts and copies the
|
/// Deserialises a YAML node that contains a map of Scripts and copies the
|
||||||
/// deserialised data into the specified object if there are matching fields.
|
/// deserialised data into the specified object if there are matching fields.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="yamlNode">
|
/// <param name="yamlNode">
|
||||||
/// The JSON string that contains the data to copy into this PlushieScript
|
/// The JSON string that contains the data to copy into this Script object.
|
||||||
/// object.
|
|
||||||
/// </param>
|
/// </param>
|
||||||
/// <param name="object">The object to copy deserialised data into.</param>
|
/// <param name="object">The object to copy deserialised data into.</param>
|
||||||
static void Deserialise(YAML::Node& yamlNode, Object^ object);
|
static void Deserialise(System::Object^ object, YAML::Node& yamlNode);
|
||||||
|
|
||||||
|
private:
|
||||||
/*-----------------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------------*/
|
||||||
/* Serialization Helper Functions */
|
/* Serialization Helper Functions */
|
||||||
/*-----------------------------------------------------------------------------*/
|
/*-----------------------------------------------------------------------------*/
|
||||||
static void writeFieldIntoYaml(System::Reflection::FieldInfo^ fieldInfo, Object^ object, YAML::Emitter& yaml);
|
static void writeFieldIntoYaml(System::Reflection::FieldInfo^ fieldInfo, Object^ object, YAML::Node& yamlNode);
|
||||||
template<typename FieldType>
|
template<typename FieldType>
|
||||||
static bool fieldInsertYaml(System::Reflection::FieldInfo^ fieldInfo, System::Object^ object, YAML::Emitter& emitter);
|
static bool fieldInsertYaml(System::Reflection::FieldInfo^ fieldInfo, System::Object^ object, YAML::Node& fieldNode);
|
||||||
static void writeYamlIntoField(System::Reflection::FieldInfo^ fieldInfo, Object^ object, YAML::Node& node);
|
static void writeYamlIntoField(System::Reflection::FieldInfo^ fieldInfo, Object^ object, YAML::Node& node);
|
||||||
template<typename FieldType>
|
template<typename FieldType>
|
||||||
static bool fieldAssignYaml(System::Reflection::FieldInfo^ fieldInfo, Object^ object, YAML::Node& node);
|
static bool fieldAssignYaml(System::Reflection::FieldInfo^ fieldInfo, Object^ object, YAML::Node& node);
|
||||||
|
|
|
@ -91,4 +91,68 @@ namespace SHADE
|
||||||
/// <returns>Managed copy of a native std::string.</returns>
|
/// <returns>Managed copy of a native std::string.</returns>
|
||||||
static System::String^ ToCLI(const std::string& str);
|
static System::String^ ToCLI(const std::string& str);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Type Transformer for managed types to native types.
|
||||||
|
/// </summary>
|
||||||
|
/// <typeparam name="ManagedType">
|
||||||
|
/// Managed type to get the native type for.
|
||||||
|
/// </typeparam>
|
||||||
|
template<typename ManagedType>
|
||||||
|
struct ToNativeType
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
using Value = void;
|
||||||
|
};
|
||||||
|
template<> struct ToNativeType<System::Int16> { using Value = int16_t; };
|
||||||
|
template<> struct ToNativeType<System::Int32> { using Value = int32_t; };
|
||||||
|
template<> struct ToNativeType<System::Int64> { using Value = int64_t; };
|
||||||
|
template<> struct ToNativeType<System::UInt16> { using Value = uint16_t; };
|
||||||
|
template<> struct ToNativeType<System::UInt32> { using Value = uint32_t; };
|
||||||
|
template<> struct ToNativeType<System::UInt64> { using Value = uint64_t; };
|
||||||
|
template<> struct ToNativeType<System::Byte> { using Value = int8_t; };
|
||||||
|
template<> struct ToNativeType<bool> { using Value = bool; };
|
||||||
|
template<> struct ToNativeType<double> { using Value = double; };
|
||||||
|
template<> struct ToNativeType<float> { using Value = float; };
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Alias for ToNativeType::Value
|
||||||
|
/// </summary>
|
||||||
|
/// <typeparam name="ManagedType">
|
||||||
|
/// Managed type to get the native type for.
|
||||||
|
/// </typeparam>
|
||||||
|
template<typename ManagedType>
|
||||||
|
using ToNativeType_T = typename ToNativeType<ManagedType>::Value;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Type Transformer for native types to managed types.
|
||||||
|
/// </summary>
|
||||||
|
/// <typeparam name="ManagedType">
|
||||||
|
/// Managed type to get the native type for.
|
||||||
|
/// </typeparam>
|
||||||
|
template<typename NativeType>
|
||||||
|
struct ToManagedType
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
using Value = void;
|
||||||
|
};
|
||||||
|
template<> struct ToManagedType<int8_t> { using Value = System::Byte; };
|
||||||
|
template<> struct ToManagedType<int16_t> { using Value = System::Int16; };
|
||||||
|
template<> struct ToManagedType<int32_t> { using Value = System::Int32; };
|
||||||
|
template<> struct ToManagedType<int64_t> { using Value = System::Int64; };
|
||||||
|
template<> struct ToManagedType<uint16_t> { using Value = System::UInt16; };
|
||||||
|
template<> struct ToManagedType<uint32_t> { using Value = System::UInt32; };
|
||||||
|
template<> struct ToManagedType<uint64_t> { using Value = System::UInt64; };
|
||||||
|
template<> struct ToManagedType<bool> { using Value = bool; };
|
||||||
|
template<> struct ToManagedType<double> { using Value = double; };
|
||||||
|
template<> struct ToManagedType<float> { using Value = float; };
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Alias for ToManagedType::Value
|
||||||
|
/// </summary>
|
||||||
|
/// <typeparam name="ManagedType">
|
||||||
|
/// Managed type to get the native type for.
|
||||||
|
/// </typeparam>
|
||||||
|
template<typename NativeType>
|
||||||
|
using ToManagedType_T = typename ToManagedType<NativeType>::Value;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue