Merge branch 'main' into SP3-20-UI-System
This commit is contained in:
commit
76e794a543
|
@ -272,6 +272,13 @@ namespace SHADE
|
||||||
if (arm->isActive == true)
|
if (arm->isActive == true)
|
||||||
{
|
{
|
||||||
camera.offset = arm->GetOffset();
|
camera.offset = arm->GetOffset();
|
||||||
|
|
||||||
|
SHVec3 tOffset = arm->GetTargetOffset();
|
||||||
|
|
||||||
|
|
||||||
|
tOffset = SHVec3::RotateY(tOffset, SHMath::DegreesToRadians(arm->GetYaw()));
|
||||||
|
|
||||||
|
|
||||||
if (arm->lookAtCameraOrigin)
|
if (arm->lookAtCameraOrigin)
|
||||||
CameraLookAt(camera, camera.position + arm->GetTargetOffset());
|
CameraLookAt(camera, camera.position + arm->GetTargetOffset());
|
||||||
|
|
||||||
|
|
|
@ -308,7 +308,7 @@ namespace SHADE
|
||||||
const bool CHANGED = ImGui::InputText("##", &buffer[0], TEXT_FIELD_MAX_LENGTH);
|
const bool CHANGED = ImGui::InputText("##", &buffer[0], TEXT_FIELD_MAX_LENGTH);
|
||||||
if (CHANGED)
|
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;
|
return CHANGED;
|
||||||
}
|
}
|
||||||
|
|
|
@ -91,12 +91,17 @@ namespace SHADE
|
||||||
{
|
{
|
||||||
if (str == nullptr)
|
if (str == nullptr)
|
||||||
return "";
|
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)
|
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());
|
||||||
}
|
}
|
||||||
|
|
||||||
/*---------------------------------------------------------------------------------*/
|
/*---------------------------------------------------------------------------------*/
|
||||||
|
|
Loading…
Reference in New Issue