edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-15 04:28:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9210 from Robyt3/Client-Mapsounds-Validation

Browse source 
Improve map sound validation and performance
This commit is contained in:
Dennis Felsing 2024-11-06 07:26:24 +00:00 committed by GitHub
parent b29723dbb5 06fcfe03b0
commit fb7d8ab912
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 57 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
src/game/client/components/mapsounds.cpp
View file

@ -70,8 +70,14 @@ void CMapSounds::OnMapLoad()
} }
else else
{ {
const int SoundDataSize = pMap->GetDataSize(pSound->m_SoundData);
const void *pData = pMap->GetData(pSound->m_SoundData); const void *pData = pMap->GetData(pSound->m_SoundData);
if(pData == nullptr)
{
log_error("mapsounds", "Failed to load map sound %d: failed to load data.", i);
ShowWarning = true;
continue;
}
const int SoundDataSize = pMap->GetDataSize(pSound->m_SoundData);
m_aSounds[i] = Sound()->LoadOpusFromMem(pData, SoundDataSize); m_aSounds[i] = Sound()->LoadOpusFromMem(pData, SoundDataSize);
pMap->UnloadData(pSound->m_SoundData); pMap->UnloadData(pSound->m_SoundData);
} }
@ -83,51 +89,43 @@ void CMapSounds::OnMapLoad()
} }
// enqueue sound sources // enqueue sound sources
for(int g = 0; g < Layers()->NumGroups(); g++) for(int GroupIndex = 0; GroupIndex < Layers()->NumGroups(); GroupIndex++)
{ {
CMapItemGroup *pGroup = Layers()->GetGroup(g); const CMapItemGroup *pGroup = Layers()->GetGroup(GroupIndex);
if(!pGroup) if(!pGroup)
continue; continue;
for(int l = 0; l < pGroup->m_NumLayers; l++) for(int LayerIndex = 0; LayerIndex < pGroup->m_NumLayers; LayerIndex++)
{ {
CMapItemLayer *pLayer = Layers()->GetLayer(pGroup->m_StartLayer + l); const CMapItemLayer *pLayer = Layers()->GetLayer(pGroup->m_StartLayer + LayerIndex);
if(!pLayer) if(!pLayer)
continue; continue;
if(pLayer->m_Type != LAYERTYPE_SOUNDS)
continue;
if(pLayer->m_Type == LAYERTYPE_SOUNDS) const CMapItemLayerSounds *pSoundLayer = reinterpret_cast<const CMapItemLayerSounds *>(pLayer);
{
CMapItemLayerSounds *pSoundLayer = (CMapItemLayerSounds *)pLayer;
if(pSoundLayer->m_Version < 1 || pSoundLayer->m_Version > CMapItemLayerSounds::CURRENT_VERSION) if(pSoundLayer->m_Version < 1 || pSoundLayer->m_Version > CMapItemLayerSounds::CURRENT_VERSION)
continue; continue;
if(pSoundLayer->m_Sound < 0 || pSoundLayer->m_Sound >= m_Count || m_aSounds[pSoundLayer->m_Sound] == -1)
if(pSoundLayer->m_Sound == -1)
continue; continue;
CSoundSource *pSources = (CSoundSource *)Layers()->Map()->GetDataSwapped(pSoundLayer->m_Data); const CSoundSource *pSources = static_cast<CSoundSource *>(Layers()->Map()->GetDataSwapped(pSoundLayer->m_Data));
if(!pSources) if(!pSources)
continue; continue;
for(int i = 0; i < pSoundLayer->m_NumSources; i++) const size_t NumSources = minimum<size_t>(pSoundLayer->m_NumSources, Layers()->Map()->GetDataSize(pSoundLayer->m_Data) / sizeof(CSoundSource));
for(size_t SourceIndex = 0; SourceIndex < NumSources; SourceIndex++)
{ {
CSourceQueueEntry Source; CSourceQueueEntry Source;
Source.m_Sound = pSoundLayer->m_Sound; Source.m_Sound = pSoundLayer->m_Sound;
Source.m_pSource = &pSources[i];
Source.m_HighDetail = pLayer->m_Flags & LAYERFLAG_DETAIL; Source.m_HighDetail = pLayer->m_Flags & LAYERFLAG_DETAIL;
Source.m_pGroup = pGroup;
if(!Source.m_pSource || Source.m_Sound < 0 || Source.m_Sound >= m_Count) Source.m_pSource = &pSources[SourceIndex];
continue;
m_vSourceQueue.push_back(Source); m_vSourceQueue.push_back(Source);
} }
} }
} }
} }
}
void CMapSounds::OnRender() void CMapSounds::OnRender()
{ {
@ -190,66 +188,31 @@ void CMapSounds::OnRender()
} }
} }
vec2 Center = m_pClient->m_Camera.m_Center; const vec2 Center = m_pClient->m_Camera.m_Center;
for(int g = 0; g < Layers()->NumGroups(); g++) for(const auto &Source : m_vSourceQueue)
{ {
CMapItemGroup *pGroup = Layers()->GetGroup(g); if(!Source.m_Voice.IsValid())
if(!pGroup)
continue;
for(int l = 0; l < pGroup->m_NumLayers; l++)
{
CMapItemLayer *pLayer = Layers()->GetLayer(pGroup->m_StartLayer + l);
if(!pLayer)
continue;
if(pLayer->m_Type == LAYERTYPE_SOUNDS)
{
CMapItemLayerSounds *pSoundLayer = (CMapItemLayerSounds *)pLayer;
if(pSoundLayer->m_Version < 1 || pSoundLayer->m_Version > CMapItemLayerSounds::CURRENT_VERSION)
continue;
CSoundSource *pSources = (CSoundSource *)Layers()->Map()->GetDataSwapped(pSoundLayer->m_Data);
if(!pSources)
continue;
for(int s = 0; s < pSoundLayer->m_NumSources; s++)
{
for(auto &Voice : m_vSourceQueue)
{
if(Voice.m_pSource != &pSources[s])
continue;
if(!Voice.m_Voice.IsValid())
continue; continue;
ColorRGBA Position = ColorRGBA(0.0f, 0.0f, 0.0f, 0.0f); ColorRGBA Position = ColorRGBA(0.0f, 0.0f, 0.0f, 0.0f);
CMapLayers::EnvelopeEval(Voice.m_pSource->m_PosEnvOffset, Voice.m_pSource->m_PosEnv, Position, 2, &m_pClient->m_MapLayersBackground); CMapLayers::EnvelopeEval(Source.m_pSource->m_PosEnvOffset, Source.m_pSource->m_PosEnv, Position, 2, &m_pClient->m_MapLayersBackground);
float x = fx2f(Voice.m_pSource->m_Position.x) + Position.r; float x = fx2f(Source.m_pSource->m_Position.x) + Position.r;
float y = fx2f(Voice.m_pSource->m_Position.y) + Position.g; float y = fx2f(Source.m_pSource->m_Position.y) + Position.g;
x += Center.x * (1.0f - pGroup->m_ParallaxX / 100.0f); x += Center.x * (1.0f - Source.m_pGroup->m_ParallaxX / 100.0f);
y += Center.y * (1.0f - pGroup->m_ParallaxY / 100.0f); y += Center.y * (1.0f - Source.m_pGroup->m_ParallaxY / 100.0f);
x -= pGroup->m_OffsetX; x -= Source.m_pGroup->m_OffsetX;
y -= pGroup->m_OffsetY; y -= Source.m_pGroup->m_OffsetY;
Sound()->SetVoicePosition(Voice.m_Voice, vec2(x, y)); Sound()->SetVoicePosition(Source.m_Voice, vec2(x, y));
ColorRGBA Volume = ColorRGBA(1.0f, 0.0f, 0.0f, 0.0f); ColorRGBA Volume = ColorRGBA(1.0f, 0.0f, 0.0f, 0.0f);
CMapLayers::EnvelopeEval(Voice.m_pSource->m_SoundEnvOffset, Voice.m_pSource->m_SoundEnv, Volume, 1, &m_pClient->m_MapLayersBackground); CMapLayers::EnvelopeEval(Source.m_pSource->m_SoundEnvOffset, Source.m_pSource->m_SoundEnv, Volume, 1, &m_pClient->m_MapLayersBackground);
if(Volume.r < 1.0f) if(Volume.r < 1.0f)
{ {
Sound()->SetVoiceVolume(Voice.m_Voice, Volume.r); Sound()->SetVoiceVolume(Source.m_Voice, Volume.r);
}
}
}
}
} }
} }
} }

14
src/game/client/components/mapsounds.h
View file

@ -1,32 +1,28 @@
#ifndef GAME_CLIENT_COMPONENTS_MAPSOUNDS_H #ifndef GAME_CLIENT_COMPONENTS_MAPSOUNDS_H
#define GAME_CLIENT_COMPONENTS_MAPSOUNDS_H #define GAME_CLIENT_COMPONENTS_MAPSOUNDS_H
#include <vector>
#include <engine/sound.h> #include <engine/sound.h>
#include <game/client/component.h> #include <game/client/component.h>
#include <game/mapitems.h> #include <game/mapitems.h>
struct CSoundSource; #include <vector>
class CMapSounds : public CComponent class CMapSounds : public CComponent
{ {
int m_aSounds[MAX_MAPSOUNDS]; int m_aSounds[MAX_MAPSOUNDS];
int m_Count; int m_Count;
struct CSourceQueueEntry class CSourceQueueEntry
{ {
public:
int m_Sound; int m_Sound;
bool m_HighDetail; bool m_HighDetail;
ISound::CVoiceHandle m_Voice; ISound::CVoiceHandle m_Voice;
CSoundSource *m_pSource; const CMapItemGroup *m_pGroup;
const CSoundSource *m_pSource;
bool operator==(const CSourceQueueEntry &Other) const { return (m_Sound == Other.m_Sound) && (m_Voice == Other.m_Voice) && (m_pSource == Other.m_pSource); }
}; };
std::vector<CSourceQueueEntry> m_vSourceQueue; std::vector<CSourceQueueEntry> m_vSourceQueue;
void Clear(); void Clear();
public: public: