zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-20 08:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add scriptstrings from loaded zones to newly linked zone

Browse Source
This commit is contained in:
Jan 2021-03-18 20:03:00 +01:00
parent 2a6d7c84c2
commit 5443ed4261
5 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ObjLoading/AssetLoading/AssetLoadingManager.cpp
View File

@ -86,6 +86,11 @@ XAssetInfoGeneric* AssetLoadingManager::LoadAssetDependency(const asset_type_t a
return nullptr; return nullptr;
} }
// Make sure any used script string is available in the created zone
// The replacement of the scr_string_t values will be done upon writing
for(auto scrString : existingAsset->m_used_script_strings)
m_context.m_zone->m_script_strings.AddScriptString(existingAsset->m_zone->m_script_strings[scrString]);
AddAsset(existingAsset->m_type, existingAsset->m_name, existingAsset->m_ptr, std::move(dependencies), existingAsset->m_used_script_strings, existingAsset->m_zone); AddAsset(existingAsset->m_type, existingAsset->m_name, existingAsset->m_ptr, std::move(dependencies), existingAsset->m_used_script_strings, existingAsset->m_zone);
auto* lastDependency = m_last_dependency_loaded; auto* lastDependency = m_last_dependency_loaded;
m_last_dependency_loaded = nullptr; m_last_dependency_loaded = nullptr;

4
src/ZoneCodeGeneratorLib/Generating/Templates/ZoneWriteTemplate.cpp
View File

@ -128,6 +128,7 @@ class ZoneWriteTemplate::Internal final : BaseTemplate
{ {
LINE("varScriptString = " << MakeMemberAccess(info, member, modifier) << ";") LINE("varScriptString = " << MakeMemberAccess(info, member, modifier) << ";")
LINE("WriteScriptStringArray(true, " << MakeEvaluation(modifier.GetArrayPointerCountEvaluation()) << ");") LINE("WriteScriptStringArray(true, " << MakeEvaluation(modifier.GetArrayPointerCountEvaluation()) << ");")
LINE("m_stream->MarkFollowing("<<MakeMemberAccess(info, member, modifier)<<");")
} }
else if (writeType == MemberWriteType::EMBEDDED_ARRAY) else if (writeType == MemberWriteType::EMBEDDED_ARRAY)
{ {
@ -440,9 +441,6 @@ class ZoneWriteTemplate::Internal final : BaseTemplate
WriteMember_Alloc(info, member, modifier, writeType); WriteMember_Alloc(info, member, modifier, writeType);
LINE("")
LINE("m_stream->MarkFollowing("<<MakeMemberAccess(info, member, modifier)<<");")
m_intendation--; m_intendation--;
LINE("}") LINE("}")
} }

11
src/ZoneCommon/Zone/ZoneScriptStrings.cpp
View File

@ -24,6 +24,17 @@ scr_string_t ZoneScriptStrings::AddScriptString(const std::string& value)
return newScrStringIndex; return newScrStringIndex;
} }
scr_string_t ZoneScriptStrings::GetScriptString(const std::string& value) const
{
const auto existingScriptString = m_scr_string_lookup.find(value);
if (existingScriptString != m_scr_string_lookup.end())
return existingScriptString->second;
std::ostringstream str;
str << "Unable to find script string \"" << value << "\"";
throw std::runtime_error(str.str());
}
size_t ZoneScriptStrings::Count() const size_t ZoneScriptStrings::Count() const
{ {
return m_scr_strings.size(); return m_scr_strings.size();

1
src/ZoneCommon/Zone/ZoneScriptStrings.h
View File

@ -15,6 +15,7 @@ class ZoneScriptStrings
public: public:
scr_string_t AddScriptString(const std::string& value); scr_string_t AddScriptString(const std::string& value);
scr_string_t GetScriptString(const std::string& value) const;
_NODISCARD size_t Count() const; _NODISCARD size_t Count() const;
_NODISCARD bool Empty() const; _NODISCARD bool Empty() const;

12
src/ZoneWriting/Writing/AssetWriter.cpp
View File

@ -1,8 +1,6 @@
#include "AssetWriter.h" #include "AssetWriter.h"
#include <cassert> #include <cassert>
#include <algorithm>
#include <iterator>
AssetWriter::AssetWriter(XAssetInfoGeneric* asset, Zone* zone, IZoneOutputStream* stream) AssetWriter::AssetWriter(XAssetInfoGeneric* asset, Zone* zone, IZoneOutputStream* stream)
: ContentWriterBase(zone, stream), : ContentWriterBase(zone, stream),
@ -19,15 +17,7 @@ scr_string_t AssetWriter::UseScriptString(const scr_string_t scrString) const
return scrString; return scrString;
const auto strValue = m_asset->m_zone->m_script_strings[scrString]; const auto strValue = m_asset->m_zone->m_script_strings[scrString];
const auto scrStringEntry = std::find(m_zone->m_script_strings.begin(), m_zone->m_script_strings.end(), strValue); return m_zone->m_script_strings.GetScriptString(strValue);
assert(scrStringEntry != m_zone->m_script_strings.end());
if (scrStringEntry != m_zone->m_script_strings.end())
{
return static_cast<scr_string_t>(std::distance(scrStringEntry, m_zone->m_script_strings.begin()));
}
return 0;
} }
void AssetWriter::WriteScriptStringArray(const bool atStreamStart, const size_t count) void AssetWriter::WriteScriptStringArray(const bool atStreamStart, const size_t count)