From bc4a8577f3f139a8d0b420e2decbbb9701d25c4c Mon Sep 17 00:00:00 2001 From: Henny022p Date: Tue, 23 Nov 2021 05:40:41 +0100 Subject: moved asset_processor to new location --- tools/src/asset_processor/offsets.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 tools/src/asset_processor/offsets.cpp (limited to 'tools/src/asset_processor/offsets.cpp') diff --git a/tools/src/asset_processor/offsets.cpp b/tools/src/asset_processor/offsets.cpp new file mode 100644 index 00000000..45d991a3 --- /dev/null +++ b/tools/src/asset_processor/offsets.cpp @@ -0,0 +1,9 @@ +#include "offsets.h" + +OffsetCalculator::OffsetCalculator(std::filesystem::path outputFile, int baseOffset): baseOffset(baseOffset) { + output = std::ofstream(outputFile); +} + +void OffsetCalculator::addAsset(int start, std::string symbol) { + this->output << "\t.equiv offset_" << symbol << ", " << start - this->baseOffset << std::endl; +} \ No newline at end of file -- cgit v1.2.3 From dee773da4a12af1c48bf58d6275fe4fed20871b6 Mon Sep 17 00:00:00 2001 From: Henny022p Date: Tue, 23 Nov 2021 09:31:09 +0100 Subject: apply clang-format to tool sources --- tools/src/asset_processor/offsets.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/src/asset_processor/offsets.cpp') diff --git a/tools/src/asset_processor/offsets.cpp b/tools/src/asset_processor/offsets.cpp index 45d991a3..48ed4139 100644 --- a/tools/src/asset_processor/offsets.cpp +++ b/tools/src/asset_processor/offsets.cpp @@ -1,6 +1,6 @@ #include "offsets.h" -OffsetCalculator::OffsetCalculator(std::filesystem::path outputFile, int baseOffset): baseOffset(baseOffset) { +OffsetCalculator::OffsetCalculator(std::filesystem::path outputFile, int baseOffset) : baseOffset(baseOffset) { output = std::ofstream(outputFile); } -- cgit v1.2.3 From 794d5fc97cb01a70c8579dc08962b667edf5a29e Mon Sep 17 00:00:00 2001 From: Henny022p Date: Tue, 23 Nov 2021 20:22:22 +0100 Subject: cleaned asset_processor to build without warnings --- tools/src/asset_processor/offsets.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tools/src/asset_processor/offsets.cpp') diff --git a/tools/src/asset_processor/offsets.cpp b/tools/src/asset_processor/offsets.cpp index 48ed4139..bff5b1a5 100644 --- a/tools/src/asset_processor/offsets.cpp +++ b/tools/src/asset_processor/offsets.cpp @@ -1,9 +1,9 @@ #include "offsets.h" -OffsetCalculator::OffsetCalculator(std::filesystem::path outputFile, int baseOffset) : baseOffset(baseOffset) { - output = std::ofstream(outputFile); +OffsetCalculator::OffsetCalculator(const std::filesystem::path& outputFile, int baseOffset_) + : output(outputFile), baseOffset(baseOffset_) { } -void OffsetCalculator::addAsset(int start, std::string symbol) { - this->output << "\t.equiv offset_" << symbol << ", " << start - this->baseOffset << std::endl; +void OffsetCalculator::addAsset(int start, const std::string& symbol) { + output << "\t.equiv offset_" << symbol << ", " << start - baseOffset << std::endl; } \ No newline at end of file -- cgit v1.2.3 From bb425249204147db4aa2c22ff20b68909478ad26 Mon Sep 17 00:00:00 2001 From: octorock <79596758+octorock@users.noreply.github.com> Date: Wed, 24 Nov 2021 13:02:16 +0100 Subject: Fix offset calculation for asset build mode --- tools/src/asset_processor/offsets.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/src/asset_processor/offsets.cpp') diff --git a/tools/src/asset_processor/offsets.cpp b/tools/src/asset_processor/offsets.cpp index bff5b1a5..827fe7a6 100644 --- a/tools/src/asset_processor/offsets.cpp +++ b/tools/src/asset_processor/offsets.cpp @@ -1,7 +1,7 @@ #include "offsets.h" OffsetCalculator::OffsetCalculator(const std::filesystem::path& outputFile, int baseOffset_) - : output(outputFile), baseOffset(baseOffset_) { + : output(outputFile), baseOffset(baseOffset_), lastEnd(0) { } void OffsetCalculator::addAsset(int start, const std::string& symbol) { -- cgit v1.2.3