Skip to content

Commit

Permalink
reduced project size by 80% by shortening all json names
Browse files Browse the repository at this point in the history
  • Loading branch information
@Spuckwaffel
Spuckwaffel committed Sep 6, 2023
1 parent f76cbd5 commit f3e29be
Show file tree
Hide file tree
Showing 4 changed files with 111 additions and 112 deletions.
170 changes: 85 additions & 85 deletions UEDumper/Engine/Core/EngineStructs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,22 +60,22 @@ struct fieldType
nlohmann::json toJson() const
{
nlohmann::json j;
j["clickable"] = clickable;
j["propertyType"] = propertyType;
j["name"] = name;
j["c"] = clickable;
j["p"] = propertyType;
j["n"] = name;
nlohmann::json jsubTypes;
for (const auto& subType : subTypes)
jsubTypes.push_back(subType.toJson());
j["subTypes"] = jsubTypes;
j["s"] = jsubTypes;
return j;
}
static fieldType fromJson(const nlohmann::json& json)
{
fieldType t;
t.clickable = json["clickable"];
t.propertyType = json["propertyType"];
t.name = json["name"];
for (const nlohmann::json& subType : json["subTypes"])
t.clickable = json["c"];
t.propertyType = json["p"];
t.name = json["n"];
for (const nlohmann::json& subType : json["s"])
t.subTypes.push_back(fromJson(subType));
return t;
}
Expand Down Expand Up @@ -116,28 +116,28 @@ namespace EngineStructs
nlohmann::json toJson() const
{
nlohmann::json j;
j["type"] = type.toJson();
j["name"] = name;
j["offset"] = offset;
j["size"] = size;
j["missed"] = missed;
j["isBit"] = isBit;
j["bitOffset"] = bitOffset;
j["userEdited"] = userEdited;
j["t"] = type.toJson();
j["n"] = name;
j["o"] = offset;
j["s"] = size;
j["m"] = missed;
j["i"] = isBit;
j["b"] = bitOffset;
j["u"] = userEdited;
return j;
}

static Member fromJson(const nlohmann::json& json)
{
Member m;
m.type = fieldType::fromJson(json["type"]);
m.name = json["name"];
m.offset = json["offset"];
m.size = json["size"];
m.missed = json["missed"];
m.isBit = json["isBit"];
m.bitOffset = json["bitOffset"];
m.userEdited = json["userEdited"];
m.type = fieldType::fromJson(json["t"]);
m.name = json["n"];
m.offset = json["o"];
m.size = json["s"];
m.missed = json["m"];
m.isBit = json["i"];
m.bitOffset = json["b"];
m.userEdited = json["u"];
return m;
}
};
Expand All @@ -158,30 +158,30 @@ namespace EngineStructs
nlohmann::json toJson() const
{
nlohmann::json j;
j["memoryAddress"] = memoryAddress;
j["returnType"] = returnType.toJson();
j["m"] = memoryAddress;
j["r"] = returnType.toJson();
nlohmann::json jParams;
for (const auto& param : params)
jParams.push_back({std::get<0>(param).toJson(), std::get<1>(param), std::get<2>(param), std::get<3>(param) });
j["params"] = jParams;
j["fullName"] = fullName;
j["cppName"] = cppName;
j["functionFlags"] = functionFlags;
j["binaryOffset"] = binaryOffset;
j["p"] = jParams;
j["fn"] = fullName;
j["c"] = cppName;
j["ff"] = functionFlags;
j["b"] = binaryOffset;
return j;
}

static Function fromJson(const nlohmann::json& json)
{
Function f;
f.memoryAddress = json["memoryAddress"];
f.returnType = fieldType::fromJson(json["returnType"]);
for (const nlohmann::json& param : json["params"])
f.memoryAddress = json["m"];
f.returnType = fieldType::fromJson(json["r"]);
for (const nlohmann::json& param : json["p"])
f.params.push_back(std::tuple(fieldType::fromJson(param[0]), param[1], param[2], param[3]));
f.fullName = json["fullName"];
f.cppName = json["cppName"];
f.functionFlags = json["functionFlags"];
f.binaryOffset = json["binaryOffset"];
f.fullName = json["fn"];
f.cppName = json["c"];
f.functionFlags = json["ff"];
f.binaryOffset = json["b"];
return f;
}
};
Expand Down Expand Up @@ -213,41 +213,41 @@ namespace EngineStructs
nlohmann::json toJson() const
{
nlohmann::json j;
j["isClass"] = isClass;
j["memoryAddress"] = memoryAddress;
j["fullName"] = fullName;
j["cppName"] = cppName;
j["supers"] = supers;
j["inherited"] = inherited;
j["size"] = size;
j["inheretedSize"] = inheretedSize;
j["unknownCount"] = unknownCount;
j["ic"] = isClass;
j["ma"] = memoryAddress;
j["fn"] = fullName;
j["c"] = cppName;
j["sp"] = supers;
j["in"] = inherited;
j["sz"] = size;
j["is"] = inheretedSize;
j["uc"] = unknownCount;
nlohmann::json jMembers;
for (const auto& member : definedMembers)
jMembers.push_back(member.toJson());
j["members"] = jMembers;
j["m"] = jMembers;
nlohmann::json jFunctions;
for (const auto& fn : functions)
jFunctions.push_back(fn.toJson());
j["functions"] = jFunctions;
j["f"] = jFunctions;
return j;
}

static Struct fromJson(const nlohmann::json& json)
{
Struct s;
s.isClass = json["isClass"];
s.memoryAddress = json["memoryAddress"];
s.fullName = json["fullName"];
s.cppName = json["cppName"];
s.supers = json["supers"];
s.inherited = json["inherited"];
s.size = json["size"];
s.inheretedSize = json["inheretedSize"];
s.unknownCount = json["unknownCount"];
for (const nlohmann::json& member : json["members"])
s.isClass = json["ic"];
s.memoryAddress = json["ma"];
s.fullName = json["fn"];
s.cppName = json["c"];
s.supers = json["sp"];
s.inherited = json["in"];
s.size = json["sz"];
s.inheretedSize = json["is"];
s.unknownCount = json["uc"];
for (const nlohmann::json& member : json["m"])
s.definedMembers.push_back(Member::fromJson(member));
for (const nlohmann::json& fn : json["functions"])
for (const nlohmann::json& fn : json["f"])
s.functions.push_back(Function::fromJson(fn));


Expand All @@ -266,32 +266,32 @@ namespace EngineStructs
nlohmann::json toJson() const
{
nlohmann::json j;
j["memoryAddress"] = memoryAddress;
j["fullName"] = fullName;
j["cppName"] = cppName;
j["type"] = type;
j["ma"] = memoryAddress;
j["f"] = fullName;
j["c"] = cppName;
j["t"] = type;
nlohmann::json jMembers;
for(const auto& member : members)
{
nlohmann::json jMember;
jMember["first"] = member.first;
jMember["second"] = member.second;
jMember["f"] = member.first;
jMember["s"] = member.second;
jMembers.push_back(jMember);
}
j["members"] = jMembers;
j["m"] = jMembers;
return j;
}

static Enum fromJson(const nlohmann::json& json)
{
Enum e;
e.memoryAddress = json["memoryAddress"];
e.fullName = json["fullName"];
e.cppName = json["cppName"];
e.type = json["type"];
const nlohmann::json jMembers = json["members"];
e.memoryAddress = json["ma"];
e.fullName = json["f"];
e.cppName = json["c"];
e.type = json["t"];
const nlohmann::json jMembers = json["m"];
for (const nlohmann::json& member : jMembers)
e.members.push_back(std::pair(member["first"], member["second"]));
e.members.push_back(std::pair(member["f"], member["s"]));

return e;
}
Expand Down Expand Up @@ -326,43 +326,43 @@ namespace EngineStructs
nlohmann::json toJson() const
{
nlohmann::json j;
j["packageName"] = packageName;
j["index"] = index;
j["p"] = packageName;
j["i"] = index;

nlohmann::json jStructs;
for(const auto& struc : structs)
jStructs.push_back(struc.toJson());
j["structs"] = jStructs;
j["s"] = jStructs;

nlohmann::json jClasses;
for (const auto& clas : classes)
jClasses.push_back(clas.toJson());
j["classes"] = jClasses;
j["c"] = jClasses;

nlohmann::json jFunctions;
for (const auto& function : functions)
jFunctions.push_back({ std::get<0>(function), std::get<1>(function), std::get<2>(function) });
j["functions"] = jFunctions;
j["f"] = jFunctions;

nlohmann::json jEnums;
for (const auto& enu : enums)
jEnums.push_back(enu.toJson());
j["enums"] = jEnums;
j["e"] = jEnums;
return j;
}

static Package fromJson(const nlohmann::json& json)
{
Package p;
p.packageName = json["packageName"];
p.index = json["index"];
for (const nlohmann::json& struc : json["structs"])
p.packageName = json["p"];
p.index = json["i"];
for (const nlohmann::json& struc : json["s"])
p.structs.push_back(Struct::fromJson(struc));
for (const nlohmann::json& clas : json["classes"])
for (const nlohmann::json& clas : json["c"])
p.classes.push_back(Struct::fromJson(clas));
for (const nlohmann::json& function : json["functions"])
for (const nlohmann::json& function : json["f"])
p.functions.push_back(std::tuple(function[0], function[1], function[2]));
for (const nlohmann::json& enu : json["enums"])
for (const nlohmann::json& enu : json["e"])
p.enums.push_back(Enum::fromJson(enu));

return p;
Expand Down
4 changes: 2 additions & 2 deletions UEDumper/Frontend/Windows/LiveEditor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1305,7 +1305,7 @@ bool windows::LiveEditor::renderQuitPopup()
void windows::LiveEditor::renderLiveEditor()
{

ImGui::BeginChild("LiveTabChild", ImVec2(330, ImGui::GetWindowSize().y - 350), true, ImGuiWindowFlags_NoScrollbar);
ImGui::BeginChild("LiveTabChild", ImVec2(330, ImGui::GetWindowSize().y - LogWindow::getLogWindowYSize() - 40), true, ImGuiWindowFlags_NoScrollbar);
if(ImGui::Button("Add Inspector"))
bRenderAddInspector = true;
if (ImGui::BeginListBox("##liveInspectorList", ImVec2(ImGui::GetWindowSize().x - 15, ImGui::GetWindowSize().y - 50)))
Expand All @@ -1324,7 +1324,7 @@ void windows::LiveEditor::renderLiveEditor()
}
ImGui::EndChild();
ImGui::SameLine();
ImGui::BeginChild("LiveViewerChild", ImVec2(ImGui::GetWindowSize().x - 350, ImGui::GetWindowSize().y - 350), true, ImGuiWindowFlags_HorizontalScrollbar);
ImGui::BeginChild("LiveViewerChild", ImVec2(ImGui::GetWindowSize().x - 350, ImGui::GetWindowSize().y - LogWindow::getLogWindowYSize() - 40), true, ImGuiWindowFlags_HorizontalScrollbar);
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, { 0,0 });
//looks like we have to render a struct
if(tabs.size() > 0 && tabPicked < tabs.size() && !bRenderAddInspector)
Expand Down
49 changes: 24 additions & 25 deletions UEDumper/Frontend/Windows/PackageViewerWindow.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,39 +69,38 @@ namespace windows
{
nlohmann::json j;

j["packageSelected"] = packageSelected;
j["typeSelected"] = typeSelected;
j["itemSelected"] = itemSelected;
j["itemRange_S"] = itemRange_S;
j["itemRange_C"] = itemRange_C;
j["itemRange_E"] = itemRange_E;
j["itemRange_F"] = itemRange_F;
j["focus"] = focus;
j["open"] = open;
j["objectBuf"] = std::string(objectBuf);
j["findObject"] = findObject;
j["findObject"] = findObject;
j["navTab"] = navTab.toJson();
j["ps"] = packageSelected;
j["ts"] = typeSelected;
j["is"] = itemSelected;
j["irs"] = itemRange_S;
j["irc"] = itemRange_C;
j["ire"] = itemRange_E;
j["irf"] = itemRange_F;
j["f"] = focus;
j["o"] = open;
j["ob"] = std::string(objectBuf);
j["fo"] = findObject;
j["nt"] = navTab.toJson();

return j;
}

static PackageTab fromJson(const nlohmann::json& j)
{
PackageTab p;
p.packageSelected = j["packageSelected"];
p.typeSelected = j["typeSelected"];
p.itemSelected = j["itemSelected"];
p.itemRange_S = j["itemRange_S"];
p.itemRange_C = j["itemRange_C"];
p.itemRange_E = j["itemRange_E"];
p.itemRange_F = j["itemRange_F"];
p.focus = j["focus"];
p.open = j["open"];
const std::string tmp = j["objectBuf"];
p.packageSelected = j["ps"];
p.typeSelected = j["ts"];
p.itemSelected = j["is"];
p.itemRange_S = j["irs"];
p.itemRange_C = j["irc"];
p.itemRange_E = j["ire"];
p.itemRange_F = j["irf"];
p.focus = j["f"];
p.open = j["o"];
const std::string tmp = j["ob"];
strcpy(p.objectBuf, tmp.c_str());
p.findObject = j["findObject"];
p.navTab = NavigationTab::fromJson(j["navTab"]);
p.findObject = j["fo"];
p.navTab = NavigationTab::fromJson(j["nt"]);

return p;
}
Expand Down
Binary file removed UEDumper/onlyup/SaveState.uedproj
View file
Binary file not shown.

0 comments on commit f3e29be

Please sign in to comment.