diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2021-04-28 05:19:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-28 05:19:50 -0400 |
| commit | b9120803e6094a54192ed67d9585ab046101c816 (patch) | |
| tree | df259449343cd0c5230dd2a5e1e9d5293d20c563 /ZAPD/ZRoom/Commands/SetLightingSettings.cpp | |
| parent | 50ad2fe786af4cf66998028a08c767e16a416a60 (diff) | |
Use OutputFormatter for every C and H file, to improve the generated output (#122)
* Small changes in collision
* Use outputformatter to write C files
* Outputformatter for .h files
* Use more fs::path
* Use gfxd_udata_set and gfxd_udata_get instead of an instance
* Fix merge issues and warnings
* run format
Diffstat (limited to 'ZAPD/ZRoom/Commands/SetLightingSettings.cpp')
| -rw-r--r-- | ZAPD/ZRoom/Commands/SetLightingSettings.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ZAPD/ZRoom/Commands/SetLightingSettings.cpp b/ZAPD/ZRoom/Commands/SetLightingSettings.cpp index 5e84c00..de9448d 100644 --- a/ZAPD/ZRoom/Commands/SetLightingSettings.cpp +++ b/ZAPD/ZRoom/Commands/SetLightingSettings.cpp @@ -25,7 +25,7 @@ SetLightingSettings::SetLightingSettings(ZRoom* nZRoom, std::vector<uint8_t> raw declaration += StringHelper::Sprintf( "\t{ 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, " "0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%04X, " - "0x%04X }, // 0x%06X \n", + "0x%04X }, // 0x%06X", settings[i]->ambientClrR, settings[i]->ambientClrG, settings[i]->ambientClrB, settings[i]->diffuseClrA_R, settings[i]->diffuseClrA_G, settings[i]->diffuseClrA_B, settings[i]->diffuseDirA_X, settings[i]->diffuseDirA_Y, settings[i]->diffuseDirA_Z, @@ -33,12 +33,14 @@ SetLightingSettings::SetLightingSettings(ZRoom* nZRoom, std::vector<uint8_t> raw settings[i]->diffuseDirB_X, settings[i]->diffuseDirB_Y, settings[i]->diffuseDirB_Z, settings[i]->fogClrR, settings[i]->fogClrG, settings[i]->fogClrB, settings[i]->unk, settings[i]->drawDistance, segmentOffset + (i * 22)); + if (i + 1 < numLights) + declaration += "\n"; } zRoom->parent->AddDeclarationArray( segmentOffset, DeclarationAlignment::None, DeclarationPadding::None, numLights * 22, "LightSettings", - StringHelper::Sprintf("%sLightSettings0x%06X", zRoom->GetName().c_str(), segmentOffset), + StringHelper::Sprintf("%sLightSettings_%06X", zRoom->GetName().c_str(), segmentOffset), numLights, declaration); } } @@ -52,7 +54,7 @@ SetLightingSettings::~SetLightingSettings() string SetLightingSettings::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) { return StringHelper::Sprintf( - "%s %i, (u32)&%sLightSettings0x%06X", + "%s %i, (u32)&%sLightSettings_%06X", ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), settings.size(), zRoom->GetName().c_str(), segmentOffset); } @@ -69,7 +71,7 @@ string SetLightingSettings::GetCommandCName() string SetLightingSettings::GenerateExterns() { - return StringHelper::Sprintf("extern LightSettings %sLightSettings0x%06X[];\n", + return StringHelper::Sprintf("extern LightSettings %sLightSettings_%06X[];\n", zRoom->GetName().c_str(), segmentOffset); } |