Backups/EGameTools
1
0
Fork 0
mirror of https://github.com/EricPlayZ/EGameTools.git synced 2025-07-18 09:27:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed some issues

Browse Source
This commit is contained in:
EricPlayZ
2024-05-11 04:28:58 +03:00
parent ef4e179600
commit bb21fb7446
3 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
EGameTools/source/game/Vector3.cpp
View File

@ -42,6 +42,10 @@ Vector3 Vector3::cross(const Vector3& v) const {
Vector3 Vector3::round() {
return { std::roundf(X), std::roundf(Y), std::roundf(Z) };
}
Vector3 Vector3::round(int decimals) {
float power = std::powf(10.0f, static_cast<float>(decimals));
return { std::roundf(X * power) / power, std::roundf(Y * power) / power, std::roundf(Z * power) / power };
}
bool Vector3::isDefault() const {
return Utils::Values::are_samef(X, 0.0f) && Utils::Values::are_samef(Y, 0.0f) && Utils::Values::are_samef(Z, 0.0f);

1
EGameTools/source/game/Vector3.h
View File

@ -15,6 +15,7 @@ struct Vector3 {
Vector3 normalize();
Vector3 cross(const Vector3& v) const;
Vector3 round();
Vector3 round(int decimals);
bool isDefault() const;
};

38
EGameTools/source/menu/teleport.cpp
View File

@ -227,17 +227,17 @@ namespace Menu {
playerPos = playerCharacter->playerPos;
}
playerPos = playerPos.round();
playerPos = playerPos.round(1);
if (savedLocIt != savedTeleportLocations.end() && savedLocIt->pos == playerPos) {
ImGui::OpenPopup("The location you have entered already exists. Either the name of the location, or the position of the location is already inside the list. If you want to change it then please remove it and add it again.");
if (savedLocIt != savedTeleportLocations.end() && savedLocIt->pos.round() == playerPos.round()) {
ImGui::OpenPopup("Location already exists");
return;
}
TeleportLocation tpLocation = TeleportLocation(locationName, playerPos);
savedTeleportLocations.push_back(tpLocation);
savedTeleportLocationNames.push_back(tpLocation.name.data());
savedTeleportLocations.emplace_back(std::string(locationName), playerPos);
savedTeleportLocationNames.clear();
for (const auto& loc : savedTeleportLocations)
savedTeleportLocationNames.emplace_back(loc.name.data());
}
static void HandleDialogs() {
if (ImGui::BeginPopupModal("Give the location a name", nullptr, ImGuiWindowFlags_AlwaysAutoResize)) {
@ -249,7 +249,7 @@ namespace Menu {
ImGui::EndPopup();
}
if (ImGui::BeginPopupModal("Location already exists", nullptr, ImGuiWindowFlags_AlwaysAutoResize)) {
ImGui::Text("The location you have entered already exists, if you want to change it then please remove it and add it again.");
ImGui::Text("The location you have entered already exists. Either the name of the location, or the position of the location is already inside the list. If you want to change it then please remove it and add it again.");
if (ImGui::Button("OK", ImVec2(120.0f, 0.0f)))
ImGui::CloseCurrentPopup();
ImGui::EndPopup();
@ -283,7 +283,9 @@ namespace Menu {
ImGui::SameLine();
if (ImGui::Button("Remove Selected Location")) {
savedTeleportLocations.erase(savedTeleportLocations.begin() + selectedTPLocation);
savedTeleportLocationNames.erase(savedTeleportLocationNames.begin() + selectedTPLocation);
savedTeleportLocationNames.clear();
for (const auto& loc : savedTeleportLocations)
savedTeleportLocationNames.emplace_back(loc.name.data());
selectedTPLocation = -1;
}
ImGui::EndDisabled();
@ -301,33 +303,33 @@ namespace Menu {
static std::string playerPos = "Player Position = X: 0.00, Y: 0.00, Z: 0.00";
Engine::CBulletPhysicsCharacter* playerCharacter = Engine::CBulletPhysicsCharacter::Get();
if (!playerCharacter)
playerPos = "Player Position = X: 0.00, Y: 0.00, Z: 0.00";
playerPos = "Player Position -- X: 0.00, Y: 0.00, Z: 0.00";
else {
playerPos = "Player Position = X: " + std::format("{:.2f}", playerCharacter->playerPos.data.X) + ", Y: " + std::format("{:.2f}", playerCharacter->playerPos.data.Y) + ", Z: " + std::format("{:.2f}", playerCharacter->playerPos.data.Z);
playerPos = "Player Position -- X: " + std::format("{:.2f}", playerCharacter->playerPos.data.X) + ", Y: " + std::format("{:.2f}", playerCharacter->playerPos.data.Y) + ", Z: " + std::format("{:.2f}", playerCharacter->playerPos.data.Z);
}
static std::string cameraPos = "Free Camera Position = X: 0.00, Y: 0.00, Z: 0.00";
static std::string cameraPos = "Free Camera Position -- X: 0.00, Y: 0.00, Z: 0.00";
GamePH::FreeCamera* freeCam = GamePH::FreeCamera::Get();
if (!Camera::freeCam.GetValue() || !freeCam)
cameraPos = "Free Camera Position = X: 0.00, Y: 0.00, Z: 0.00";
cameraPos = "Free Camera Position -- X: 0.00, Y: 0.00, Z: 0.00";
else {
Vector3 camPos{};
freeCam->GetPosition(&camPos);
if (camPos.isDefault())
cameraPos = "Free Camera Position = X: 0.00, Y: 0.00, Z: 0.00";
cameraPos = "Free Camera Position -- X: 0.00, Y: 0.00, Z: 0.00";
else
cameraPos = "Free Camera Position = X: " + std::format("{:.2f}", camPos.X) + ", Y: " + std::format("{:.2f}", camPos.Y) + ", Z: " + std::format("{:.2f}", camPos.Z);
cameraPos = "Free Camera Position -- X: " + std::format("{:.2f}", camPos.X) + ", Y: " + std::format("{:.2f}", camPos.Y) + ", Z: " + std::format("{:.2f}", camPos.Z);
}
ImGui::Text(playerPos.data());
ImGui::Text(cameraPos.data());
ImGui::PushItemWidth(200.0f);
ImGui::InputFloat("X", &teleportCoords.X, 1.0f, 10.0f, "%.3f");
ImGui::InputFloat("X", &teleportCoords.X, 1.0f, 10.0f, "%.2f");
ImGui::SameLine();
ImGui::InputFloat("Y", &teleportCoords.Y, 1.0f, 10.0f, "%.3f");
ImGui::InputFloat("Y", &teleportCoords.Y, 1.0f, 10.0f, "%.2f");
ImGui::SameLine();
ImGui::InputFloat("Z", &teleportCoords.Z, 1.0f, 10.0f, "%.3f");
ImGui::InputFloat("Z", &teleportCoords.Z, 1.0f, 10.0f, "%.2f");
ImGui::PopItemWidth();
if (ImGui::ButtonHotkey("Teleport to Coords", &teleportToCoords, "Teleports player to the coords specified in the input boxes above"))