зеркало из https://github.com/microsoft/DirectXTK.git
Minor code review
This commit is contained in:
Chuck Walbourn
Родитель
7ae63b53b9
Коммит
46e58da27c
|
|
@ -69,7 +69,7 @@ public:
|
|||
mBufferNeeded = bufferNeeded;
|
||||
}
|
||||
|
||||
virtual ~Impl() override
|
||||
~Impl() override
|
||||
{
|
||||
mBase.DestroyVoice();
|
||||
|
||||
|
|
@ -89,39 +89,39 @@ public:
|
|||
const WAVEFORMATEX* GetFormat() const noexcept { return &mWaveFormat; }
|
||||
|
||||
// IVoiceNotify
|
||||
virtual void __cdecl OnBufferEnd() override
|
||||
void __cdecl OnBufferEnd() override
|
||||
{
|
||||
SetEvent(mBufferEvent.get());
|
||||
}
|
||||
|
||||
virtual void __cdecl OnCriticalError() override
|
||||
void __cdecl OnCriticalError() override
|
||||
{
|
||||
mBase.OnCriticalError();
|
||||
}
|
||||
|
||||
virtual void __cdecl OnReset() override
|
||||
void __cdecl OnReset() override
|
||||
{
|
||||
mBase.OnReset();
|
||||
}
|
||||
|
||||
virtual void __cdecl OnUpdate() override;
|
||||
void __cdecl OnUpdate() override;
|
||||
|
||||
virtual void __cdecl OnDestroyEngine() noexcept override
|
||||
void __cdecl OnDestroyEngine() noexcept override
|
||||
{
|
||||
mBase.OnDestroy();
|
||||
}
|
||||
|
||||
virtual void __cdecl OnTrim() override
|
||||
void __cdecl OnTrim() override
|
||||
{
|
||||
mBase.OnTrim();
|
||||
}
|
||||
|
||||
virtual void __cdecl GatherStatistics(AudioStatistics& stats) const noexcept override
|
||||
void __cdecl GatherStatistics(AudioStatistics& stats) const noexcept override
|
||||
{
|
||||
mBase.GatherStatistics(stats);
|
||||
}
|
||||
|
||||
virtual void __cdecl OnDestroyParent() noexcept override
|
||||
void __cdecl OnDestroyParent() noexcept override
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ public:
|
|||
mEngine->RegisterNotify(this, false);
|
||||
}
|
||||
|
||||
virtual ~Impl() override
|
||||
~Impl() override
|
||||
{
|
||||
if (!mInstances.empty())
|
||||
{
|
||||
|
|
@ -95,39 +95,39 @@ public:
|
|||
void Play(float volume, float pitch, float pan);
|
||||
|
||||
// IVoiceNotify
|
||||
virtual void __cdecl OnBufferEnd() override
|
||||
void __cdecl OnBufferEnd() override
|
||||
{
|
||||
InterlockedDecrement(&mOneShots);
|
||||
}
|
||||
|
||||
virtual void __cdecl OnCriticalError() override
|
||||
void __cdecl OnCriticalError() override
|
||||
{
|
||||
mOneShots = 0;
|
||||
}
|
||||
|
||||
virtual void __cdecl OnReset() override
|
||||
void __cdecl OnReset() override
|
||||
{
|
||||
// No action required
|
||||
}
|
||||
|
||||
virtual void __cdecl OnUpdate() override
|
||||
void __cdecl OnUpdate() override
|
||||
{
|
||||
// We do not register for update notification
|
||||
assert(false);
|
||||
}
|
||||
|
||||
virtual void __cdecl OnDestroyEngine() noexcept override
|
||||
void __cdecl OnDestroyEngine() noexcept override
|
||||
{
|
||||
mEngine = nullptr;
|
||||
mOneShots = 0;
|
||||
}
|
||||
|
||||
virtual void __cdecl OnTrim() override
|
||||
void __cdecl OnTrim() override
|
||||
{
|
||||
// No action required
|
||||
}
|
||||
|
||||
virtual void __cdecl GatherStatistics(AudioStatistics& stats) const noexcept override
|
||||
void __cdecl GatherStatistics(AudioStatistics& stats) const noexcept override
|
||||
{
|
||||
stats.playingOneShots += mOneShots;
|
||||
stats.audioBytes += mAudioBytes;
|
||||
|
|
@ -138,7 +138,7 @@ public:
|
|||
#endif
|
||||
}
|
||||
|
||||
virtual void __cdecl OnDestroyParent() noexcept override
|
||||
void __cdecl OnDestroyParent() noexcept override
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ public:
|
|||
mBase.Initialize(engine, mWaveBank->GetFormat(index, wfx, sizeof(buff)), flags);
|
||||
}
|
||||
|
||||
virtual ~Impl() override
|
||||
~Impl() override
|
||||
{
|
||||
mBase.DestroyVoice();
|
||||
|
||||
|
|
@ -66,44 +66,44 @@ public:
|
|||
void Play(bool loop);
|
||||
|
||||
// IVoiceNotify
|
||||
virtual void __cdecl OnBufferEnd() override
|
||||
void __cdecl OnBufferEnd() override
|
||||
{
|
||||
// We don't register for this notification for SoundEffectInstances, so this should not be invoked
|
||||
assert(false);
|
||||
}
|
||||
|
||||
virtual void __cdecl OnCriticalError() override
|
||||
void __cdecl OnCriticalError() override
|
||||
{
|
||||
mBase.OnCriticalError();
|
||||
}
|
||||
|
||||
virtual void __cdecl OnReset() override
|
||||
void __cdecl OnReset() override
|
||||
{
|
||||
mBase.OnReset();
|
||||
}
|
||||
|
||||
virtual void __cdecl OnUpdate() override
|
||||
void __cdecl OnUpdate() override
|
||||
{
|
||||
// We do not register for update notification
|
||||
assert(false);
|
||||
}
|
||||
|
||||
virtual void __cdecl OnDestroyEngine() noexcept override
|
||||
void __cdecl OnDestroyEngine() noexcept override
|
||||
{
|
||||
mBase.OnDestroy();
|
||||
}
|
||||
|
||||
virtual void __cdecl OnTrim() override
|
||||
void __cdecl OnTrim() override
|
||||
{
|
||||
mBase.OnTrim();
|
||||
}
|
||||
|
||||
virtual void __cdecl GatherStatistics(AudioStatistics& stats) const noexcept override
|
||||
void __cdecl GatherStatistics(AudioStatistics& stats) const noexcept override
|
||||
{
|
||||
mBase.GatherStatistics(stats);
|
||||
}
|
||||
|
||||
virtual void __cdecl OnDestroyParent() noexcept override
|
||||
void __cdecl OnDestroyParent() noexcept override
|
||||
{
|
||||
mBase.OnDestroy();
|
||||
mWaveBank = nullptr;
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ public:
|
|||
mEngine->RegisterNotify(this, false);
|
||||
}
|
||||
|
||||
virtual ~Impl() override
|
||||
~Impl() override
|
||||
{
|
||||
if (!mInstances.empty())
|
||||
{
|
||||
|
|
@ -71,39 +71,39 @@ public:
|
|||
void Play(unsigned int index, float volume, float pitch, float pan);
|
||||
|
||||
// IVoiceNotify
|
||||
virtual void __cdecl OnBufferEnd() override
|
||||
void __cdecl OnBufferEnd() override
|
||||
{
|
||||
InterlockedDecrement(&mOneShots);
|
||||
}
|
||||
|
||||
virtual void __cdecl OnCriticalError() override
|
||||
void __cdecl OnCriticalError() override
|
||||
{
|
||||
mOneShots = 0;
|
||||
}
|
||||
|
||||
virtual void __cdecl OnReset() override
|
||||
void __cdecl OnReset() override
|
||||
{
|
||||
// No action required
|
||||
}
|
||||
|
||||
virtual void __cdecl OnUpdate() override
|
||||
void __cdecl OnUpdate() override
|
||||
{
|
||||
// We do not register for update notification
|
||||
assert(false);
|
||||
}
|
||||
|
||||
virtual void __cdecl OnDestroyEngine() noexcept override
|
||||
void __cdecl OnDestroyEngine() noexcept override
|
||||
{
|
||||
mEngine = nullptr;
|
||||
mOneShots = 0;
|
||||
}
|
||||
|
||||
virtual void __cdecl OnTrim() override
|
||||
void __cdecl OnTrim() override
|
||||
{
|
||||
// No action required
|
||||
}
|
||||
|
||||
virtual void __cdecl GatherStatistics(AudioStatistics& stats) const noexcept override
|
||||
void __cdecl GatherStatistics(AudioStatistics& stats) const noexcept override
|
||||
{
|
||||
stats.playingOneShots += mOneShots;
|
||||
|
||||
|
|
@ -118,7 +118,7 @@ public:
|
|||
}
|
||||
}
|
||||
|
||||
virtual void __cdecl OnDestroyParent() noexcept override
|
||||
void __cdecl OnDestroyParent() noexcept override
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ namespace DirectX
|
|||
BasicEffect(BasicEffect const&) = delete;
|
||||
BasicEffect& operator= (BasicEffect const&) = delete;
|
||||
|
||||
virtual ~BasicEffect() override;
|
||||
~BasicEffect() override;
|
||||
|
||||
// IEffect methods.
|
||||
void __cdecl Apply(_In_ ID3D11DeviceContext* deviceContext) override;
|
||||
|
|
@ -221,7 +221,7 @@ namespace DirectX
|
|||
AlphaTestEffect(AlphaTestEffect const&) = delete;
|
||||
AlphaTestEffect& operator= (AlphaTestEffect const&) = delete;
|
||||
|
||||
virtual ~AlphaTestEffect() override;
|
||||
~AlphaTestEffect() override;
|
||||
|
||||
// IEffect methods.
|
||||
void __cdecl Apply(_In_ ID3D11DeviceContext* deviceContext) override;
|
||||
|
|
@ -275,7 +275,7 @@ namespace DirectX
|
|||
DualTextureEffect(DualTextureEffect const&) = delete;
|
||||
DualTextureEffect& operator= (DualTextureEffect const&) = delete;
|
||||
|
||||
virtual ~DualTextureEffect() override;
|
||||
~DualTextureEffect() override;
|
||||
|
||||
// IEffect methods.
|
||||
void __cdecl Apply(_In_ ID3D11DeviceContext* deviceContext) override;
|
||||
|
|
@ -326,7 +326,7 @@ namespace DirectX
|
|||
EnvironmentMapEffect(EnvironmentMapEffect const&) = delete;
|
||||
EnvironmentMapEffect& operator= (EnvironmentMapEffect const&) = delete;
|
||||
|
||||
virtual ~EnvironmentMapEffect() override;
|
||||
~EnvironmentMapEffect() override;
|
||||
|
||||
// IEffect methods.
|
||||
void __cdecl Apply(_In_ ID3D11DeviceContext* deviceContext) override;
|
||||
|
|
@ -397,7 +397,7 @@ namespace DirectX
|
|||
SkinnedEffect(SkinnedEffect const&) = delete;
|
||||
SkinnedEffect& operator= (SkinnedEffect const&) = delete;
|
||||
|
||||
virtual ~SkinnedEffect() override;
|
||||
~SkinnedEffect() override;
|
||||
|
||||
// IEffect methods.
|
||||
void __cdecl Apply(_In_ ID3D11DeviceContext* deviceContext) override;
|
||||
|
|
@ -470,7 +470,7 @@ namespace DirectX
|
|||
DGSLEffect(DGSLEffect const&) = delete;
|
||||
DGSLEffect& operator= (DGSLEffect const&) = delete;
|
||||
|
||||
virtual ~DGSLEffect() override;
|
||||
~DGSLEffect() override;
|
||||
|
||||
// IEffect methods.
|
||||
void __cdecl Apply(_In_ ID3D11DeviceContext* deviceContext) override;
|
||||
|
|
@ -549,7 +549,7 @@ namespace DirectX
|
|||
NormalMapEffect(NormalMapEffect const&) = delete;
|
||||
NormalMapEffect& operator= (NormalMapEffect const&) = delete;
|
||||
|
||||
virtual ~NormalMapEffect() override;
|
||||
~NormalMapEffect() override;
|
||||
|
||||
// IEffect methods.
|
||||
void __cdecl Apply(_In_ ID3D11DeviceContext* deviceContext) override;
|
||||
|
|
@ -621,7 +621,7 @@ namespace DirectX
|
|||
PBREffect(PBREffect const&) = delete;
|
||||
PBREffect& operator= (PBREffect const&) = delete;
|
||||
|
||||
virtual ~PBREffect() override;
|
||||
~PBREffect() override;
|
||||
|
||||
// IEffect methods.
|
||||
void __cdecl Apply(_In_ ID3D11DeviceContext* deviceContext) override;
|
||||
|
|
@ -706,7 +706,7 @@ namespace DirectX
|
|||
DebugEffect(DebugEffect const&) = delete;
|
||||
DebugEffect& operator= (DebugEffect const&) = delete;
|
||||
|
||||
virtual ~DebugEffect() override;
|
||||
~DebugEffect() override;
|
||||
|
||||
// IEffect methods.
|
||||
void __cdecl Apply(_In_ ID3D11DeviceContext* deviceContext) override;
|
||||
|
|
@ -809,11 +809,11 @@ namespace DirectX
|
|||
EffectFactory(EffectFactory const&) = delete;
|
||||
EffectFactory& operator= (EffectFactory const&) = delete;
|
||||
|
||||
virtual ~EffectFactory() override;
|
||||
~EffectFactory() override;
|
||||
|
||||
// IEffectFactory methods.
|
||||
virtual std::shared_ptr<IEffect> __cdecl CreateEffect(_In_ const EffectInfo& info, _In_opt_ ID3D11DeviceContext* deviceContext) override;
|
||||
virtual void __cdecl CreateTexture(_In_z_ const wchar_t* name, _In_opt_ ID3D11DeviceContext* deviceContext, _Outptr_ ID3D11ShaderResourceView** textureView) override;
|
||||
std::shared_ptr<IEffect> __cdecl CreateEffect(_In_ const EffectInfo& info, _In_opt_ ID3D11DeviceContext* deviceContext) override;
|
||||
void __cdecl CreateTexture(_In_z_ const wchar_t* name, _In_opt_ ID3D11DeviceContext* deviceContext, _Outptr_ ID3D11ShaderResourceView** textureView) override;
|
||||
|
||||
// Settings.
|
||||
void __cdecl ReleaseCache();
|
||||
|
|
@ -847,11 +847,11 @@ namespace DirectX
|
|||
PBREffectFactory(PBREffectFactory const&) = delete;
|
||||
PBREffectFactory& operator= (PBREffectFactory const&) = delete;
|
||||
|
||||
virtual ~PBREffectFactory() override;
|
||||
~PBREffectFactory() override;
|
||||
|
||||
// IEffectFactory methods.
|
||||
virtual std::shared_ptr<IEffect> __cdecl CreateEffect(_In_ const EffectInfo& info, _In_opt_ ID3D11DeviceContext* deviceContext) override;
|
||||
virtual void __cdecl CreateTexture(_In_z_ const wchar_t* name, _In_opt_ ID3D11DeviceContext* deviceContext, _Outptr_ ID3D11ShaderResourceView** textureView) override;
|
||||
std::shared_ptr<IEffect> __cdecl CreateEffect(_In_ const EffectInfo& info, _In_opt_ ID3D11DeviceContext* deviceContext) override;
|
||||
void __cdecl CreateTexture(_In_z_ const wchar_t* name, _In_opt_ ID3D11DeviceContext* deviceContext, _Outptr_ ID3D11ShaderResourceView** textureView) override;
|
||||
|
||||
// Settings.
|
||||
void __cdecl ReleaseCache();
|
||||
|
|
@ -884,11 +884,11 @@ namespace DirectX
|
|||
DGSLEffectFactory(DGSLEffectFactory const&) = delete;
|
||||
DGSLEffectFactory& operator= (DGSLEffectFactory const&) = delete;
|
||||
|
||||
virtual ~DGSLEffectFactory() override;
|
||||
~DGSLEffectFactory() override;
|
||||
|
||||
// IEffectFactory methods.
|
||||
virtual std::shared_ptr<IEffect> __cdecl CreateEffect(_In_ const EffectInfo& info, _In_opt_ ID3D11DeviceContext* deviceContext) override;
|
||||
virtual void __cdecl CreateTexture(_In_z_ const wchar_t* name, _In_opt_ ID3D11DeviceContext* deviceContext, _Outptr_ ID3D11ShaderResourceView** textureView) override;
|
||||
std::shared_ptr<IEffect> __cdecl CreateEffect(_In_ const EffectInfo& info, _In_opt_ ID3D11DeviceContext* deviceContext) override;
|
||||
void __cdecl CreateTexture(_In_z_ const wchar_t* name, _In_opt_ ID3D11DeviceContext* deviceContext, _Outptr_ ID3D11ShaderResourceView** textureView) override;
|
||||
|
||||
// DGSL methods.
|
||||
struct DGSLEffectInfo : public EffectInfo
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ namespace DirectX
|
|||
BasicPostProcess(BasicPostProcess const&) = delete;
|
||||
BasicPostProcess& operator= (BasicPostProcess const&) = delete;
|
||||
|
||||
virtual ~BasicPostProcess() override;
|
||||
~BasicPostProcess() override;
|
||||
|
||||
// IPostProcess methods.
|
||||
void __cdecl Process(_In_ ID3D11DeviceContext* deviceContext, _In_opt_ std::function<void __cdecl()> setCustomState = nullptr) override;
|
||||
|
|
@ -114,7 +114,7 @@ namespace DirectX
|
|||
DualPostProcess(DualPostProcess const&) = delete;
|
||||
DualPostProcess& operator= (DualPostProcess const&) = delete;
|
||||
|
||||
virtual ~DualPostProcess() override;
|
||||
~DualPostProcess() override;
|
||||
|
||||
// IPostProcess methods.
|
||||
void __cdecl Process(_In_ ID3D11DeviceContext* deviceContext, _In_opt_ std::function<void __cdecl()> setCustomState = nullptr) override;
|
||||
|
|
@ -169,7 +169,7 @@ namespace DirectX
|
|||
ToneMapPostProcess(ToneMapPostProcess const&) = delete;
|
||||
ToneMapPostProcess& operator= (ToneMapPostProcess const&) = delete;
|
||||
|
||||
virtual ~ToneMapPostProcess() override;
|
||||
~ToneMapPostProcess() override;
|
||||
|
||||
// IPostProcess methods.
|
||||
void __cdecl Process(_In_ ID3D11DeviceContext* deviceContext, _In_opt_ std::function<void __cdecl()> setCustomState = nullptr) override;
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ namespace DirectX
|
|||
public:
|
||||
com_exception(HRESULT hr) noexcept : result(hr) {}
|
||||
|
||||
virtual const char* what() const override
|
||||
const char* what() const override
|
||||
{
|
||||
static char s_str[64] = {};
|
||||
sprintf_s(s_str, "Failure with HRESULT of %08X", static_cast<unsigned int>(result));
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче