mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-10-17 19:09:25 +02:00
* refactor(sonar): use override instead of redundant virtual (cpp:S3471) * refactor(sonar): remove empty statements, one declaration per statement (cpp:S1116, cpp:S1659) * refactor(sonar): drop redundant lambda return types (cpp:S3574) * refactor(sonar): prefer using over typedef (cpp:S5416) * refactor(sonar): use =default for trivial special members (cpp:S3490) * refactor(sonar): use nullptr literal (cpp:S4962) * refactor(sonar): remove redundant access specifiers (cpp:S3539) * refactor(sonar): remove redundant casts (cpp:S1905) * refactor(sonar): use std::scoped_lock instead of std::lock_guard (cpp:S5997) * refactor(sonar): construct elements in place with emplace_back (cpp:S6003) * refactor(sonar): make narrowing conversions explicit (cpp:S5276) * refactor(sonar): mark unused parameters (cpp:S1172) Unused names are commented out; parameters used only on some platforms are marked [[maybe_unused]]. * refactor(sonar): declare non-mutating member functions const (cpp:S5817) Virtual functions are left untouched so overrides keep matching. * refactor(sonar): merge collapsible nested if statements (cpp:S1066) Comments that preceded the inner if are kept above the merged statement. * refactor(sonar): scope single-use variables in if init-statements (cpp:S6004) * fix(sonar): give polymorphic base classes virtual destructors (cpp:S1235) * refactor(sonar): use try_emplace for map insertion (cpp:S6030) * refactor(sonar): use auto where the type is spelled out on the right (cpp:S5827) * refactor(sonar): remove redundant parentheses (cpp:S1110) * refactor(sonar): document intentionally empty functions (cpp:S1186) * refactor(sonar): remove dead stores (cpp:S1854) Side effects (e.g. LISTLINE++) are kept. * refactor(sonar): remove unused variables, captures and private fields (cpp:S1481, cpp:S1068) * refactor(sonar): use structured bindings for pair access (cpp:S6005) * refactor(sonar): use range-based loops and ranges algorithms (cpp:S5566) * refactor(sonar): split chained assignments (cpp:S1121) * refactor(sonar): add default cases to switch statements (cpp:S3562) * refactor(sonar): use std::size for array lengths (cpp:S7127) * refactor(sonar): use std::ranges algorithms and std::erase(_if) (cpp:S6197) * refactor(sonar): access static members through the class (cpp:S2209) * refactor(sonar): add braces around nested if-else (cpp:S5261) * refactor(sonar): avoid side effects inside typeid operands (cpp:S5279) * refactor(sonar): drop top-level const from by-value return types (cpp:S5951) * refactor(sonar): declare variables separately from their type definitions (cpp:S3646) * refactor(sonar): declare loop counters in the for statement (cpp:S5955) * refactor(sonar): rely on class template argument deduction (cpp:S6012) * refactor(sonar): inherit base constructors instead of forwarding them (cpp:S5952) * refactor(sonar): rename locals that shadow outer declarations (cpp:S1117) Only local variables and definition parameters are renamed; shadowing struct fields and enumerators in headers are left for a separate change. * refactor(sonar): reduce enum qualification with using enum (cpp:S6177) Applied only where no unqualified name in the block could be captured by the introduced enumerators. * refactor(sonar): mark converting constructors explicit (cpp:S1709) sound_source and the gl::object conversion operators stay implicit; they are relied upon by copy-list-initialisation and GL calls. * refactor(sonar): initialise members in initialiser lists or declarations (cpp:S3230) * refactor(sonar): make read-only local references and pointers const (cpp:S5350) * refactor(sonar): take read-only pointer and reference parameters as const (cpp:S995) TTrain command handlers keep their signature, it is fixed by the handler table. * refactor(sonar): pass expensive-to-copy parameters by const reference (cpp:S1238) Signatures declared in files touched by PR 206 (Driver.h, EU07.cpp) and virtual overrides are left unchanged. * refactor(sonar): use transparent comparators for string-keyed maps (cpp:S6045) std::unordered_map instances and map types exposed in headers used by other modules are left as they are. * fix(sonar): do not use UI text as a printf format string (cpp:S5281) Text lines containing '%' would otherwise be interpreted as format specifiers by ImGui::TextColored. * refactor(sonar): use std::bind_front for callbacks (cpp:S5995) * refactor(sonar): drop const_cast on string literals passed to the Python C API (cpp:S859) * refactor(sonar): take read-only string parameters as std::string_view (cpp:S6009) The Windows messaging helpers keep std::string, they need c_str(). * refactor(sonar): make read-only global tables const (cpp:S5421) Mutable global state (flags, timers, singletons) is left as is. * refactor(sonar): replace single-case switch statements with if (cpp:S1301) * refactor(sonar): format UUIDs and log timestamps with std::format (cpp:S6494, cpp:S5945) * refactor(sonar): use std::array for local fixed-size arrays (cpp:S5945) Arrays that are class members or part of headers are left unchanged. * fix(sonar): test the bearing damage bit, not bit 0 (cpp:S872) 'DamageFlag & dtrain_bearing > 0' parsed as 'DamageFlag & (dtrain_bearing > 0)', i.e. DamageFlag & 1, so bearing friction reacted to the wrong damage flag. * refactor(sonar): assorted small fixes - empty() instead of size() comparisons (cpp:S1155) - member initialisers in declaration order (cpp:S3229) - no redundant c_str() when a std::string is accepted (cpp:S7121) - contains() on associative containers (cpp:S6171) - const reference instead of a copying range-for (cpp:S6032) - starts_with() for prefix checks (cpp:S6178) - no std::move on temporaries (cpp:S5274) - has_value() on std::optional (cpp:S7172) - bool literals for bool members (cpp:S5820) - inline only on the definition (cpp:S3548) - explicit base access specifier (cpp:S5965) - explicit element access instead of dereferencing an array (cpp:S7116) - rely on the C++20 rewritten operator!= (cpp:S6186) * refactor(sonar): more small fixes - std::format instead of iostream manipulators in to_string/to_hex_str (cpp:S6495); output verified identical, negative hex values keep the unsigned form - remove an empty compound statement (cpp:S108) - drop an always-false unsigned < 0 branch (cpp:S1768) - explicit lambda capture (cpp:S3608) - std::make_unique (cpp:S5950) * chore: strip stray carriage returns left in TTrain constructor comments * fix: keep quantize() in its own value type The S5276 change cast the result of the generic quantize<Type_>() to unsigned int, which truncated float/double callers (shadow angle slider, editor rotation snapping, AI speed control steps) and broke negative values. * fix(sonar): use integer loop counters in segment sampling (cpp:S2193) * refactor(sonar): clean up issues reported on PR 209 - remove locals left unused after the dead-store cleanup (cpp:S1481, cpp:S1854) - unnamed unused parameter (cpp:S1172) - single-use declarations moved into if init-statements (cpp:S6004) - auto for casted initialisers (cpp:S5827) - const references and pointers where nothing is modified (cpp:S5350) - rename structured bindings shadowed by inner declarations (cpp:S1117)
212 lines
4.6 KiB
C++
212 lines
4.6 KiB
C++
// https://github.com/inequation/flip-s3tc
|
|
// Leszek Godlewski places this file in the public domain.
|
|
|
|
#pragma once
|
|
|
|
#include <stdint.h>
|
|
|
|
#ifdef __cplusplus
|
|
namespace flip_s3tc
|
|
{
|
|
#endif
|
|
|
|
#pragma pack(push, 1)
|
|
|
|
struct dxt1_block
|
|
{
|
|
uint16_t c0;
|
|
uint16_t c1;
|
|
uint8_t dcba;
|
|
uint8_t hgfe;
|
|
uint8_t lkji;
|
|
uint8_t ponm;
|
|
};
|
|
|
|
struct dxt23_block
|
|
{
|
|
uint16_t adacabaa;
|
|
uint16_t ahagafae;
|
|
uint16_t alakajai;
|
|
uint16_t apaoanam;
|
|
uint16_t c0;
|
|
uint16_t c1;
|
|
uint8_t dcba;
|
|
uint8_t hgfe;
|
|
uint8_t lkji;
|
|
uint8_t ponm;
|
|
};
|
|
|
|
struct dxt45_block
|
|
{
|
|
uint8_t a0;
|
|
uint8_t a1;
|
|
struct
|
|
{
|
|
uint8_t alpha[3];
|
|
} ahagafaeadacabaa,
|
|
apaoanamalakajai;
|
|
uint16_t c0;
|
|
uint16_t c1;
|
|
uint8_t dcba;
|
|
uint8_t hgfe;
|
|
uint8_t lkji;
|
|
uint8_t ponm;
|
|
};
|
|
|
|
#pragma pack(pop)
|
|
|
|
/** Performs an Y-flip of the given DXT1 block in place. */
|
|
void flip_dxt1_block(struct dxt1_block *block)
|
|
{
|
|
uint8_t temp;
|
|
|
|
temp = block->dcba;
|
|
block->dcba = block->ponm;
|
|
block->ponm = temp;
|
|
temp = block->hgfe;
|
|
block->hgfe = block->lkji;
|
|
block->lkji = temp;
|
|
}
|
|
|
|
/** Performs an Y-flip of the given DXT2/DXT3 block in place. */
|
|
void flip_dxt23_block(struct dxt23_block *block)
|
|
{
|
|
uint8_t temp8;
|
|
uint16_t temp16;
|
|
|
|
temp16 = block->adacabaa;
|
|
block->adacabaa = block->apaoanam;
|
|
block->apaoanam = temp16;
|
|
temp16 = block->ahagafae;
|
|
block->ahagafae = block->alakajai;
|
|
block->alakajai = temp16;
|
|
|
|
temp8 = block->dcba;
|
|
block->dcba = block->ponm;
|
|
block->ponm = temp8;
|
|
temp8 = block->hgfe;
|
|
block->hgfe = block->lkji;
|
|
block->lkji = temp8;
|
|
}
|
|
|
|
/** Performs an Y-flip of the given DXT4/DXT5 block in place. */
|
|
void flip_dxt45_block(struct dxt45_block *block)
|
|
{
|
|
uint8_t temp8;
|
|
uint32_t temp32;
|
|
uint32_t *as_int[2];
|
|
|
|
as_int[0] = (uint32_t *)block->ahagafaeadacabaa.alpha;
|
|
as_int[1] = (uint32_t *)block->apaoanamalakajai.alpha;
|
|
// swap adacabaa with apaoanam
|
|
temp32 = *as_int[0] & ((1 << 12) - 1);
|
|
*as_int[0] &= ~((1 << 12) - 1);
|
|
*as_int[0] |= (*as_int[1] & (((1 << 12) - 1) << 12)) >> 12;
|
|
*as_int[1] &= ~(((1 << 12) - 1) << 12);
|
|
*as_int[1] |= temp32 << 12;
|
|
// swap ahagafae with alakajai
|
|
temp32 = *as_int[0] & (((1 << 12) - 1) << 12);
|
|
*as_int[0] &= ~(((1 << 12) - 1) << 12);
|
|
*as_int[0] |= (*as_int[1] & ((1 << 12) - 1)) << 12;
|
|
*as_int[1] &= ~((1 << 12) - 1);
|
|
*as_int[1] |= temp32 >> 12;
|
|
|
|
temp8 = block->dcba;
|
|
block->dcba = block->ponm;
|
|
block->ponm = temp8;
|
|
temp8 = block->hgfe;
|
|
block->hgfe = block->lkji;
|
|
block->lkji = temp8;
|
|
}
|
|
|
|
/**
|
|
* Performs an Y-flip on the given DXT1 image in place.
|
|
* @param data buffer with image data (S3TC blocks)
|
|
* @param width image width in pixels
|
|
* @param height image height in pixels
|
|
*/
|
|
void flip_dxt1_image(void *data, int width, int height)
|
|
{
|
|
struct dxt1_block temp1;
|
|
struct dxt1_block temp2;
|
|
auto blocks = (struct dxt1_block *)data;
|
|
|
|
width = (width + 3) / 4;
|
|
height = (height + 3) / 4;
|
|
|
|
for (int y = 0; y < height / 2; ++y)
|
|
{
|
|
for (int x = 0; x < width; ++x)
|
|
{
|
|
temp1 = blocks[y * width + x];
|
|
temp2 = blocks[(height - y - 1) * width + x];
|
|
flip_dxt1_block(&temp1);
|
|
flip_dxt1_block(&temp2);
|
|
blocks[(height - y - 1) * width + x] = temp1;
|
|
blocks[y * width + x] = temp2;
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Performs an Y-flip on the given DXT2/DXT3 image in place.
|
|
* @param data buffer with image data (S3TC blocks)
|
|
* @param width image width in pixels
|
|
* @param height image height in pixels
|
|
*/
|
|
void flip_dxt23_image(void *data, int width, int height)
|
|
{
|
|
struct dxt23_block temp1;
|
|
struct dxt23_block temp2;
|
|
auto blocks = (struct dxt23_block *)data;
|
|
|
|
width = (width + 3) / 4;
|
|
height = (height + 3) / 4;
|
|
|
|
for (int y = 0; y < height / 2; ++y)
|
|
{
|
|
for (int x = 0; x < width; ++x)
|
|
{
|
|
temp1 = blocks[y * width + x];
|
|
temp2 = blocks[(height - y - 1) * width + x];
|
|
flip_dxt23_block(&temp1);
|
|
flip_dxt23_block(&temp2);
|
|
blocks[(height - y - 1) * width + x] = temp1;
|
|
blocks[y * width + x] = temp2;
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Performs an Y-flip on the given DXT1 image in place.
|
|
* @param data buffer with image data (S3TC blocks)
|
|
* @param width image width in pixels
|
|
* @param height image height in pixels
|
|
*/
|
|
void flip_dxt45_image(void *data, int width, int height)
|
|
{
|
|
struct dxt45_block temp1;
|
|
struct dxt45_block temp2;
|
|
auto blocks = (struct dxt45_block *)data;
|
|
|
|
width = (width + 3) / 4;
|
|
height = (height + 3) / 4;
|
|
|
|
for (int y = 0; y < height / 2; ++y)
|
|
{
|
|
for (int x = 0; x < width; ++x)
|
|
{
|
|
temp1 = blocks[y * width + x];
|
|
temp2 = blocks[(height - y - 1) * width + x];
|
|
flip_dxt45_block(&temp1);
|
|
flip_dxt45_block(&temp2);
|
|
blocks[(height - y - 1) * width + x] = temp1;
|
|
blocks[y * width + x] = temp2;
|
|
}
|
|
}
|
|
}
|
|
|
|
#if __cplusplus
|
|
} // namespace flip_s3tc
|
|
#endif
|