xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity

Merge branch 'main' into SP3-20-UI-System

This commit is contained in:
maverickdgg 2023-03-05 13:56:29 +08:00
parent 4bc568899d 29d33d45ad
commit 76e794a543
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
SHADE_Engine/src/Camera/SHCameraSystem.cpp
View File

@ -272,6 +272,13 @@ namespace SHADE
if (arm->isActive == true)
{
camera.offset = arm->GetOffset();
SHVec3 tOffset = arm->GetTargetOffset();
tOffset = SHVec3::RotateY(tOffset, SHMath::DegreesToRadians(arm->GetYaw()));
if (arm->lookAtCameraOrigin)
CameraLookAt(camera, camera.position + arm->GetTargetOffset());

2
SHADE_Engine/src/Editor/SHEditorUI.cpp
View File

@ -308,7 +308,7 @@ namespace SHADE
const bool CHANGED = ImGui::InputText("##", &buffer[0], TEXT_FIELD_MAX_LENGTH);
if (CHANGED)
{
value = std::string(buffer.data(), buffer.data() + TEXT_FIELD_MAX_LENGTH);
value = std::string(buffer.data(), buffer.data() + std::strlen(buffer.data()));
}
return CHANGED;
}

9
SHADE_Managed/src/Utility/Convert.cxx
View File

@ -91,12 +91,17 @@ namespace SHADE
{
if (str == nullptr)
return "";
return msclr::interop::marshal_as<std::string>(str);
std::string s = msclr::interop::marshal_as<std::string>(str);
s.substr(0, str->Length);
return s;
}
System::String^ Convert::ToCLI(const std::string& str)
{
return msclr::interop::marshal_as<System::String^>(str);
if (str.empty())
return "";
return msclr::interop::marshal_as<System::String^>(str)->Substring(0, str.length());
}
/*---------------------------------------------------------------------------------*/