Skip to content

Commit

Permalink
Stage 1 of migration from camelCase to snake_case
Browse files Browse the repository at this point in the history
  • Loading branch information
praydog committed Aug 19, 2022
1 parent 98b10f8 commit 335d8ff
Show file tree
Hide file tree
Showing 16 changed files with 409 additions and 309 deletions.
15 changes: 15 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
BasedOnStyle: LLVM
IndentWidth: 4
ColumnLimit: 140
---
Language: Cpp
AccessModifierOffset: -4
AlignAfterOpenBracket: DontAlign
AlignEscapedNewlines: Left
AllowShortFunctionsOnASingleLine: InlineOnly
ConstructorInitializerAllOnOneLineOrOnePerLine: false
DerivePointerAlignment: false
PointerAlignment: Left
BreakConstructorInitializers: BeforeComma
...
65 changes: 65 additions & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
Checks: -*,readability-identifier-naming,readability-else-after-return
HeaderFilterRegex: '^.*src.*(RE|Mod|FreeCam|FirstPerson|Hook|Developer|Object|Flashlight|utility).*\.hpp$'
# HeaderFilterRegex: '^(.*src.*REContext).*\.hpp$'
CheckOptions:
# Classes, structs, ...
- key: readability-identifier-naming.NamespaceCase
value: lower_case
- key: readability-identifier-naming.ClassCase
value: CamelCase
- key: readability-identifier-naming.StructCase
value: CamelCase
- key: readability-identifier-naming.EnumCase
value: CamelCase
- key: readability-identifier-naming.UnionCase
value: CamelCase
- key: readability-identifier-naming.TypedefCase
value: CamelCase

# Variables, member variables, ...
- key: readability-identifier-naming.ParameterCase
value: lower_case
- key: readability-identifier-naming.VariableCase
value: lower_case
- key: readability-identifier-naming.MemberCase
value: lower_case
- key: readability-identifier-naming.PublicMemberCase
value: lower_case
- key: readability-identifier-naming.ProtectedMemberCase
value: lower_case
- key: readability-identifier-naming.PrivateMemberCase
value: lower_case
- key: readability-identifier-naming.PrivateMemberSuffix
value: ''

# Functions, methods, ...
- key: readability-identifier-naming.FunctionCase
value: lower_case
- key: readability-identifier-naming.MethodCase
value: lower_case

# Constants
- key: readability-identifier-naming.ConstantPrefix
value: ''
- key: readability-identifier-naming.ConstantCase
value: UPPER_CASE
- key: readability-identifier-naming.ConstantMemberPrefix
value: ''
- key: readability-identifier-naming.ConstantMemberCase
value: lower_case
- key: readability-identifier-naming.ConstantParameterPrefix
value: ''
- key: readability-identifier-naming.ConstantParameterCase
value: lower_case
- key: readability-identifier-naming.LocalConstantParameterPrefix
value: ''
- key: readability-identifier-naming.LocalConstantCase
value: lower_case
- key: readability-identifier-naming.ConstexprVariablePrefix
value: ''
- key: readability-identifier-naming.ConstexprVariableCase
value: lower_case

# Other
- key: readability-braces-around-statements.ShortStatementLines
value: 0
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,6 @@
*.app

build/*
.vscode/*
.vscode/*
out/*
.vs/*
21 changes: 21 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -373,13 +373,16 @@ list(APPEND sdk_SOURCES
"shared/sdk/hap/State.hpp"
"shared/sdk/hap/StateObject.hpp"
"shared/sdk/hap/TokenCategory.hpp"
"shared/sdk/hap/VariantMap.hpp"
"shared/sdk/hap/scene_pos/ScenePosSystem.hpp"
"shared/sdk/hap/scene_state/SceneStateSystem.hpp"
"shared/sdk/hap/string_t.hpp"
"shared/sdk/lib/Downcastable.hpp"
"shared/sdk/lib/HashedString.hpp"
"shared/sdk/lib/Noncopyable.hpp"
"shared/sdk/regenny/Behavior.hpp"
"shared/sdk/regenny/BehaviorAppBase.hpp"
"shared/sdk/regenny/BehaviorExtension.hpp"
"shared/sdk/regenny/Camera.hpp"
"shared/sdk/regenny/CameraApp.hpp"
"shared/sdk/regenny/CameraBase.hpp"
Expand All @@ -389,17 +392,35 @@ list(APPEND sdk_SOURCES
"shared/sdk/regenny/CharacterController.hpp"
"shared/sdk/regenny/EModel.hpp"
"shared/sdk/regenny/ERunSpeedType.hpp"
"shared/sdk/regenny/Em0000.hpp"
"shared/sdk/regenny/Entity.hpp"
"shared/sdk/regenny/ExActionState.hpp"
"shared/sdk/regenny/ExAtkCombo.hpp"
"shared/sdk/regenny/ExBaseInfo.hpp"
"shared/sdk/regenny/ExCatch.hpp"
"shared/sdk/regenny/ExCollision.hpp"
"shared/sdk/regenny/ExExpInfo.hpp"
"shared/sdk/regenny/ExHackingInfo.hpp"
"shared/sdk/regenny/ExLayoutParent.hpp"
"shared/sdk/regenny/ExLockOn.hpp"
"shared/sdk/regenny/ExNpc.hpp"
"shared/sdk/regenny/ExWaypoint.hpp"
"shared/sdk/regenny/Matrix4x4f.hpp"
"shared/sdk/regenny/Model.hpp"
"shared/sdk/regenny/Obj.hpp"
"shared/sdk/regenny/Parts.hpp"
"shared/sdk/regenny/Pl0000.hpp"
"shared/sdk/regenny/RTL_CRITICAL_SECTION.hpp"
"shared/sdk/regenny/UnkEntityData.hpp"
"shared/sdk/regenny/Vector3f.hpp"
"shared/sdk/regenny/Vector4f.hpp"
"shared/sdk/regenny/WpAnimName.hpp"
"shared/sdk/regenny/Xml.hpp"
"shared/sdk/regenny/XmlBinary.hpp"
"shared/sdk/regenny/cHitPrim.hpp"
"shared/sdk/regenny/cModelExtendWork.hpp"
"shared/sdk/regenny/cModelExtendWorkBase.hpp"
"shared/sdk/regenny/cObjHit.hpp"
"shared/sdk/sys/StringSystem.hpp"
)

Expand Down
3 changes: 3 additions & 0 deletions shared/sdk/BehaviorAppBase.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
#include "ScriptFunctions.hpp"
#include "Behavior.hpp"

#include "Hw/cVec4.hpp"
#include "hap/VariantMap.hpp"
#include "sys/StringSystem.hpp"
#include "lib/HashedString.hpp"

namespace sdk {
Expand Down
4 changes: 2 additions & 2 deletions shared/sdk/Game.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

#include "Game.hpp"

namespace nier {
namespace sdk {
// not loading
bool isLoading() {
bool is_loading() {
//return *(uint8_t*)0x1414838E8 != 1; // 2017 version
static bool* is_loading_ptr = []() ->bool* {
spdlog::info("Searching for isLoading...");
Expand Down
4 changes: 2 additions & 2 deletions shared/sdk/Game.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

#include <cstdint>

namespace nier {
bool isLoading();
namespace sdk {
bool is_loading();
}
8 changes: 8 additions & 0 deletions shared/sdk/hap/VariantMap.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#pragma once

namespace sdk::hap {
class VariantMap {
public:
// TODO!
};
}
38 changes: 19 additions & 19 deletions src/mods/AutomataMPMod.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ std::optional<std::string> AutomataMPMod::on_initialize() try {
return "Unknown exception";
}

void AutomataMPMod::sendPacket(const enet_uint8* data, size_t size) {
void AutomataMPMod::send_packet(const enet_uint8* data, size_t size) {
if (m_client) {
m_client->send_packet(0, data, size, ENET_PACKET_FLAG_RELIABLE);
}
Expand All @@ -58,10 +58,10 @@ void AutomataMPMod::display_servers() {
const auto now = std::chrono::steady_clock::now();

// Check if server future is ready and parse it into our internal server list.
if (m_serverFuture.valid() && m_serverFuture.wait_for(std::chrono::seconds(0)) == std::future_status::ready) {
if (m_server_future.valid() && m_server_future.wait_for(std::chrono::seconds(0)) == std::future_status::ready) {
m_servers.clear();

const auto response = m_serverFuture.get();
const auto response = m_server_future.get();
spdlog::info("Got response: {}", response);
const auto response_json = nlohmann::json::parse(response);

Expand All @@ -73,7 +73,7 @@ void AutomataMPMod::display_servers() {

new_server_data->ip = ip;
new_server_data->name = data["Name"];
new_server_data->numPlayers = data["NumPlayers"];
new_server_data->num_players = data["num_players"];

m_servers.push_back(std::move(new_server_data));
}
Expand Down Expand Up @@ -101,43 +101,43 @@ void AutomataMPMod::display_servers() {

ImGui::SameLine();

const auto made = ImGui::TreeNode((server->name + " (" + std::to_string(server->numPlayers) + " players)").c_str());
const auto made = ImGui::TreeNode((server->name + " (" + std::to_string(server->num_players) + " players)").c_str());

if (made) {
ImGui::Text("IP: %s", server->ip.c_str());
ImGui::Text("Name: %s", server->name.c_str());
ImGui::Text("Players: %s", std::to_string(server->numPlayers).c_str());
ImGui::Text("Players: %s", std::to_string(server->num_players).c_str());
ImGui::TreePop();
}

ImGui::PopID();
}

if (now - m_lastServerUpdate < std::chrono::seconds(5)) {
if (now - m_last_server_update < std::chrono::seconds(5)) {
return;
}

if (m_serverFuture.valid()) {
if (m_serverFuture.wait_for(std::chrono::seconds(0)) != std::future_status::ready) {
if (m_server_future.valid()) {
if (m_server_future.wait_for(std::chrono::seconds(0)) != std::future_status::ready) {
return;
}

m_serverFuture.wait();
m_server_future.wait();
}

m_serverFuture = std::async(std::launch::async, [this]() -> std::string {
m_server_future = std::async(std::launch::async, [this]() -> std::string {
try {
HttpClient http{};

const auto servers_url = std::string{m_master_server_input.data()} + "/servers";
http.get(servers_url, "", "");

const auto response = http.response();
m_lastServerUpdate = std::chrono::steady_clock::now();
m_last_server_update = std::chrono::steady_clock::now();

return response;
} catch (...) {
m_lastServerUpdate = std::chrono::steady_clock::now();
m_last_server_update = std::chrono::steady_clock::now();
return "";
}
});
Expand Down Expand Up @@ -199,13 +199,13 @@ void AutomataMPMod::on_frame() {
}

void AutomataMPMod::on_think() {
if (nier::isLoading() || m_wantsDestroyClient) {
if (sdk::is_loading() || m_wants_destroy_client) {
if (m_client != nullptr) {
m_client->disconnect();
m_client.reset();
}

m_wantsDestroyClient = false;
m_wants_destroy_client = false;
return;
}

Expand Down Expand Up @@ -371,7 +371,7 @@ void AutomataMPMod::on_think() {

//static uint32_t(*spawnBuddy)(Entity* player) = (decltype(spawnBuddy))0x140245C30;

sharedThink();
shared_think();

if (utility::was_key_down(VK_F9)) {
/*auto old = player->entity->getBuddyHandle();
Expand Down Expand Up @@ -421,7 +421,7 @@ void AutomataMPMod::on_think() {
}
}

void AutomataMPMod::sharedThink() {
void AutomataMPMod::shared_think() {
//spdlog::info("Shared think");

//static uint32_t(*changePlayer)(Entity* player) = (decltype(changePlayer))0x1401ED500;
Expand Down Expand Up @@ -461,8 +461,8 @@ void AutomataMPMod::sharedThink() {
}*/

if (controlledEntity->behavior->is_pl0000()) {
m_midHooks.addOverridenEntity(controlledEntity->behavior);
m_playerHook.reHook(controlledEntity->behavior->as<sdk::Pl0000>());
m_mid_hooks.add_overriden_entity(controlledEntity->behavior);
m_player_hook.re_hook(controlledEntity->behavior->as<sdk::Pl0000>());
controlledEntity->behavior->obj_flags() = 0;

auto realBuddy = entityList->getByHandle(controlledEntity->behavior->as<sdk::Pl0000>()->buddy_handle());
Expand Down
Loading

0 comments on commit 335d8ff

Please sign in to comment.