From 10c60c2b8d07f023dcf354bfe1eab3fb37f927a2 Mon Sep 17 00:00:00 2001 From: Xottab-DUTY Date: Sun, 6 Aug 2017 02:28:39 +0500 Subject: [PATCH] NULL and 0 replaced by nullptr IC, inline and etc removed where they're not needed --- src/Include/xrRender/EnvironmentRender.h | 6 +- src/Include/xrRender/FactoryPtr.h | 2 +- src/Include/xrRender/KinematicsAnimated.h | 8 +- src/Include/xrRender/RenderVisual.h | 6 +- src/Include/xrRender/UIRender.h | 2 +- src/Include/xrRender/UIShader.h | 2 +- src/Include/xrRender/animation_blend.h | 12 +- src/Include/xrRender/animation_motion.h | 2 +- src/Layers/xrRender/Animation.h | 5 +- src/Layers/xrRender/AnimationKeyCalculate.h | 2 +- src/Layers/xrRender/Blender_Model_EbB.cpp | 4 +- src/Layers/xrRender/Blender_Recorder_R2.cpp | 2 +- src/Layers/xrRender/ColorMapManager.cpp | 2 +- src/Layers/xrRender/ColorMapManager.h | 4 +- src/Layers/xrRender/D3DUtils.cpp | 10 +- src/Layers/xrRender/D3DUtils.h | 19 ++- src/Layers/xrRender/DetailFormat.h | 30 ++--- src/Layers/xrRender/DetailManager.cpp | 21 ++-- src/Layers/xrRender/DetailManager.h | 6 +- src/Layers/xrRender/DetailManager_VS.cpp | 4 +- src/Layers/xrRender/DetailModel.cpp | 4 +- src/Layers/xrRender/ETextureParams.cpp | 10 +- src/Layers/xrRender/ETextureParams.h | 12 +- src/Layers/xrRender/FBasicVisual.cpp | 2 +- src/Layers/xrRender/FBasicVisual.h | 4 +- src/Layers/xrRender/FProgressive.cpp | 2 +- src/Layers/xrRender/FSkinned.cpp | 36 +++--- src/Layers/xrRender/FSkinned.h | 21 ++-- src/Layers/xrRender/FTreeVisual.cpp | 4 +- src/Layers/xrRender/FVF.h | 87 ++++++++----- src/Layers/xrRender/FVisual.cpp | 12 +- src/Layers/xrRender/HOM.cpp | 6 +- src/Layers/xrRender/HW.cpp | 16 +-- src/Layers/xrRender/HWCaps.cpp | 2 +- src/Layers/xrRender/LightTrack.cpp | 4 +- src/Layers/xrRender/LightTrack.h | 2 +- src/Layers/xrRender/ModelPool.cpp | 20 +-- src/Layers/xrRender/ModelPool.h | 8 +- src/Layers/xrRender/NvTriStrip.h | 2 +- src/Layers/xrRender/NvTriStripObjects.cpp | 56 ++++----- src/Layers/xrRender/NvTriStripObjects.h | 17 +-- src/Layers/xrRender/PSLibrary.cpp | 8 +- src/Layers/xrRender/PSLibrary.h | 12 +- src/Layers/xrRender/ParticleEffect.cpp | 6 +- src/Layers/xrRender/ParticleEffect.h | 6 +- src/Layers/xrRender/ParticleEffectDef.cpp | 4 +- src/Layers/xrRender/ParticleEffectDef.h | 41 +++--- src/Layers/xrRender/ParticleGroup.cpp | 16 ++- src/Layers/xrRender/ParticleGroup.h | 3 +- src/Layers/xrRender/R_Backend.cpp | 4 +- src/Layers/xrRender/R_Backend.h | 42 ++++--- src/Layers/xrRender/R_Backend_Runtime.cpp | 52 ++++---- src/Layers/xrRender/R_Backend_hemi.cpp | 6 +- src/Layers/xrRender/R_Backend_tree.cpp | 16 +-- src/Layers/xrRender/R_Backend_xform.cpp | 14 +-- src/Layers/xrRender/R_Backend_xform.h | 6 +- src/Layers/xrRender/R_DStreams.cpp | 6 +- src/Layers/xrRender/R_DStreams.h | 12 +- src/Layers/xrRender/ResourceManager.cpp | 16 +-- src/Layers/xrRender/ResourceManager.h | 10 +- .../xrRender/ResourceManager_Loader.cpp | 8 +- .../xrRender/ResourceManager_Resources.cpp | 16 +-- .../xrRender/ResourceManager_Scripting.cpp | 14 +-- src/Layers/xrRender/SH_Atomic.cpp | 2 +- src/Layers/xrRender/SH_Constant.h | 12 +- src/Layers/xrRender/SH_Matrix.h | 5 +- src/Layers/xrRender/SH_RT.h | 4 +- src/Layers/xrRender/SH_Texture.cpp | 30 ++--- src/Layers/xrRender/SH_Texture.h | 15 ++- src/Layers/xrRender/Shader.cpp | 4 +- src/Layers/xrRender/Shader.h | 10 +- src/Layers/xrRender/SkeletonAnimated.cpp | 48 +++---- src/Layers/xrRender/SkeletonAnimated.h | 18 +-- src/Layers/xrRender/SkeletonCustom.cpp | 20 +-- src/Layers/xrRender/SkeletonCustom.h | 18 +-- src/Layers/xrRender/SkeletonRigid.cpp | 2 +- src/Layers/xrRender/SkeletonX.cpp | 2 +- src/Layers/xrRender/SkeletonX.h | 2 +- src/Layers/xrRender/Texture.cpp | 34 ++--- src/Layers/xrRender/TextureDescrManager.h | 2 +- src/Layers/xrRender/WallmarksEngine.cpp | 6 +- src/Layers/xrRender/blenders/Blender.cpp | 2 +- .../xrRender/blenders/Blender_Recorder.cpp | 6 +- src/Layers/xrRender/dxApplicationRender.cpp | 10 +- src/Layers/xrRender/dxEnvironmentRender.cpp | 8 +- src/Layers/xrRender/dxFontRender.cpp | 2 +- src/Layers/xrRender/dxRainRender.cpp | 2 +- src/Layers/xrRender/dxStatGraphRender.cpp | 4 +- .../xrRender/dxThunderboltDescRender.cpp | 2 +- src/Layers/xrRender/dxUIRender.h | 2 +- src/Layers/xrRender/dxUISequenceVideoItem.cpp | 2 +- src/Layers/xrRender/dxUISequenceVideoItem.h | 2 +- src/Layers/xrRender/dxUIShader.h | 2 +- src/Layers/xrRender/occRasterizer.h | 14 +-- src/Layers/xrRender/occRasterizer_core.cpp | 2 +- src/Layers/xrRender/r__dsgraph_build.cpp | 22 ++-- src/Layers/xrRender/r__dsgraph_render.cpp | 8 +- src/Layers/xrRender/r__dsgraph_types.h | 6 +- src/Layers/xrRender/r__screenshot.cpp | 46 +++---- src/Layers/xrRender/r__sector.cpp | 4 +- src/Layers/xrRender/r__sector.h | 2 +- src/Layers/xrRender/r__sector_traversal.cpp | 2 +- src/Layers/xrRender/r_constants.cpp | 6 +- src/Layers/xrRender/r_constants.h | 11 +- src/Layers/xrRender/r_sun_cascades.h | 2 +- src/Layers/xrRender/stats_manager.cpp | 8 +- src/Layers/xrRender/tss.h | 34 ++--- src/Layers/xrRender/tss_def.cpp | 2 +- src/Layers/xrRender/tss_def.h | 8 +- src/Layers/xrRender/xrRender_console.cpp | 20 +-- src/Layers/xrRender/xr_effgamma.h | 10 +- src/Layers/xrRenderDX9/dx9R_Backend_Runtime.h | 2 +- src/Layers/xrRenderPC_R1/Blender_Model.cpp | 4 +- src/Layers/xrRenderPC_R1/FStaticRender.cpp | 60 ++++----- src/Layers/xrRenderPC_R1/FStaticRender.h | 2 +- .../xrRenderPC_R1/FStaticRender_Blenders.cpp | 2 +- .../FStaticRender_DetectSector.cpp | 2 +- .../xrRenderPC_R1/FStaticRender_Loader.cpp | 28 ++--- .../FStaticRender_RenderTarget.cpp | 15 +-- src/Layers/xrRenderPC_R1/LightPPA.cpp | 6 +- src/Layers/xrRenderPC_R1/LightProjector.cpp | 24 ++-- src/Layers/xrRenderPC_R1/LightProjector.h | 2 +- src/Layers/xrRenderPC_R1/LightShadows.cpp | 32 ++--- src/Layers/xrRenderPC_R1/LightShadows.h | 6 +- src/Layers/xrRenderPC_R3/r3.h | 14 +-- src/Layers/xrRenderPC_R3/r3_rendertarget.h | 13 +- .../r3_rendertarget_enable_scissor.cpp | 2 +- .../r3_rendertarget_phase_PP.cpp | 11 +- src/utils/ETools/ETools.vcxproj | 3 + src/utils/xrSE_Factory/ai_space.cpp | 4 +- src/utils/xrSE_Factory/ai_space_inline.h | 4 +- .../properties_list_helper_script.cpp | 6 +- .../xrSE_Factory/script_debugger_utils.cpp | 10 +- .../script_properties_list_helper.cpp | 2 +- src/xrEngine/Device_destroy.cpp | 2 +- src/xrEngine/Environment.h | 16 +-- src/xrScriptEngine/script_debugger.hpp | 2 +- src/xrServerEntities/ItemListTypes.h | 4 +- src/xrServerEntities/PropertiesListTypes.h | 117 +++++++++--------- src/xrServerEntities/alife_human_brain.cpp | 4 +- src/xrServerEntities/alife_monster_brain.cpp | 2 +- src/xrServerEntities/alife_space.cpp | 2 +- src/xrServerEntities/character_info.cpp | 14 +-- src/xrServerEntities/gametype_chooser.cpp | 2 +- src/xrServerEntities/object_factory.cpp | 2 +- src/xrServerEntities/object_factory_inline.h | 2 +- src/xrServerEntities/object_item_script.cpp | 4 +- src/xrServerEntities/script_ini_file.cpp | 6 +- src/xrServerEntities/script_ini_file.h | 2 +- .../script_rtoken_list_inline.h | 2 +- .../script_value_container_impl.h | 2 +- src/xrServerEntities/shared_data.h | 4 +- src/xrServerEntities/specific_character.cpp | 4 +- src/xrServerEntities/xrEProps.h | 14 +-- src/xrServerEntities/xrServer_Object_Base.cpp | 18 +-- src/xrServerEntities/xrServer_Object_Base.h | 36 +++--- src/xrServerEntities/xrServer_Objects.cpp | 2 +- src/xrServerEntities/xrServer_Objects.h | 2 +- .../xrServer_Objects_ALife.cpp | 30 ++--- src/xrServerEntities/xrServer_Objects_ALife.h | 4 +- .../xrServer_Objects_ALife_Items.h | 2 +- .../xrServer_Objects_ALife_Monsters.cpp | 28 ++--- .../xrServer_Objects_ALife_Monsters.h | 2 +- .../xrServer_Objects_Abstract.cpp | 4 +- .../xrServer_Objects_Abstract.h | 6 +- .../xrServer_Objects_Alife_Smartcovers.cpp | 2 +- 166 files changed, 962 insertions(+), 914 deletions(-) diff --git a/src/Include/xrRender/EnvironmentRender.h b/src/Include/xrRender/EnvironmentRender.h index 08ec163443d..9edbda64005 100644 --- a/src/Include/xrRender/EnvironmentRender.h +++ b/src/Include/xrRender/EnvironmentRender.h @@ -13,7 +13,7 @@ class CEnvDescriptor; class IEnvDescriptorRender { public: - virtual ~IEnvDescriptorRender() { ; } + virtual ~IEnvDescriptorRender() {} virtual void Copy(IEnvDescriptorRender& _in) = 0; virtual void OnDeviceCreate(CEnvDescriptor& owner) = 0; @@ -23,7 +23,7 @@ class IEnvDescriptorRender class IEnvDescriptorMixerRender { public: - virtual ~IEnvDescriptorMixerRender() { ; } + virtual ~IEnvDescriptorMixerRender() {} virtual void Copy(IEnvDescriptorMixerRender& _in) = 0; virtual void Destroy() = 0; @@ -34,7 +34,7 @@ class IEnvDescriptorMixerRender class IEnvironmentRender { public: - virtual ~IEnvironmentRender() { ; } + virtual ~IEnvironmentRender() {} virtual void Copy(IEnvironmentRender& _in) = 0; virtual void OnFrame(CEnvironment& env) = 0; virtual void OnLoad() = 0; diff --git a/src/Include/xrRender/FactoryPtr.h b/src/Include/xrRender/FactoryPtr.h index ef39b629653..924adc4a8c3 100644 --- a/src/Include/xrRender/FactoryPtr.h +++ b/src/Include/xrRender/FactoryPtr.h @@ -39,7 +39,7 @@ class FactoryPtr // unspecified bool type typedef T const* (FactoryPtr::*unspecified_bool_type)() const; operator unspecified_bool_type() const { return (!m_pObject ? 0 : &FactoryPtr::get); } - bool operator!() const { return m_pObject == 0; } + bool operator!() const { return m_pObject == nullptr; } private: void CreateObject(); void DestroyObject(); diff --git a/src/Include/xrRender/KinematicsAnimated.h b/src/Include/xrRender/KinematicsAnimated.h index a08b33a6a08..ff9e904cef3 100644 --- a/src/Include/xrRender/KinematicsAnimated.h +++ b/src/Include/xrRender/KinematicsAnimated.h @@ -91,11 +91,11 @@ class IKinematicsAnimated virtual MotionID ID_Cycle(shared_str N) = 0; virtual MotionID ID_Cycle_Safe(shared_str N) = 0; virtual CBlend* PlayCycle( - LPCSTR N, BOOL bMixIn = TRUE, PlayCallback Callback = 0, LPVOID CallbackParam = 0, u8 channel = 0) = 0; + LPCSTR N, BOOL bMixIn = TRUE, PlayCallback Callback = nullptr, LPVOID CallbackParam = nullptr, u8 channel = 0) = 0; virtual CBlend* PlayCycle( - MotionID M, BOOL bMixIn = TRUE, PlayCallback Callback = 0, LPVOID CallbackParam = 0, u8 channel = 0) = 0; - virtual CBlend* PlayCycle(u16 partition, MotionID M, BOOL bMixIn = TRUE, PlayCallback Callback = 0, - LPVOID CallbackParam = 0, u8 channel = 0) = 0; + MotionID M, BOOL bMixIn = TRUE, PlayCallback Callback = nullptr, LPVOID CallbackParam = nullptr, u8 channel = 0) = 0; + virtual CBlend* PlayCycle(u16 partition, MotionID M, BOOL bMixIn = TRUE, PlayCallback Callback = nullptr, + LPVOID CallbackParam = nullptr, u8 channel = 0) = 0; // fx'es virtual MotionID ID_FX(LPCSTR N) = 0; virtual MotionID ID_FX_Safe(LPCSTR N) = 0; diff --git a/src/Include/xrRender/RenderVisual.h b/src/Include/xrRender/RenderVisual.h index 712baa53cbd..c77bb12c467 100644 --- a/src/Include/xrRender/RenderVisual.h +++ b/src/Include/xrRender/RenderVisual.h @@ -18,9 +18,9 @@ class IRenderVisual virtual shared_str getDebugName() = 0; #endif - virtual IKinematics* dcast_PKinematics() { return 0; } - virtual IKinematicsAnimated* dcast_PKinematicsAnimated() { return 0; } - virtual IParticleCustom* dcast_ParticleCustom() { return 0; } + virtual IKinematics* dcast_PKinematics() { return nullptr; } + virtual IKinematicsAnimated* dcast_PKinematicsAnimated() { return nullptr; } + virtual IParticleCustom* dcast_ParticleCustom() { return nullptr; } }; #endif // RenderVisual_included diff --git a/src/Include/xrRender/UIRender.h b/src/Include/xrRender/UIRender.h index 527b3ddc112..d40db818c0c 100644 --- a/src/Include/xrRender/UIRender.h +++ b/src/Include/xrRender/UIRender.h @@ -50,7 +50,7 @@ class IUIRender //. virtual void FlushLineStrip() = 0; //. virtual void StartLineList(u32 iMaxVerts) = 0; //. virtual void FlushLineList() = 0; - virtual void SetScissor(Irect* rect = NULL) = 0; + virtual void SetScissor(Irect* rect = nullptr) = 0; virtual void GetActiveTextureResolution(Fvector2& res) = 0; //. virtual void PushPoint(float x, float y, u32 c, float u, float v) = 0; diff --git a/src/Include/xrRender/UIShader.h b/src/Include/xrRender/UIShader.h index 184d144c91c..4c042aaac37 100644 --- a/src/Include/xrRender/UIShader.h +++ b/src/Include/xrRender/UIShader.h @@ -7,7 +7,7 @@ class IUIShader public: virtual ~IUIShader() { ; } virtual void Copy(IUIShader& _in) = 0; - virtual void create(LPCSTR sh, LPCSTR tex = 0) = 0; + virtual void create(LPCSTR sh, LPCSTR tex = nullptr) = 0; virtual bool inited() = 0; virtual void destroy() = 0; }; diff --git a/src/Include/xrRender/animation_blend.h b/src/Include/xrRender/animation_blend.h index 0bb02615a50..df6a05034ee 100644 --- a/src/Include/xrRender/animation_blend.h +++ b/src/Include/xrRender/animation_blend.h @@ -60,11 +60,11 @@ class CBlend IC void update_play(float dt, PlayCallback _Callback); IC bool update_falloff(float dt); IC bool update(float dt, PlayCallback _Callback); - IC ECurvature blend_state() const { return blend; } - IC void set_free_state() { blend = eFREE_SLOT; } - IC void set_accrue_state() { blend = eAccrue; } - IC void set_falloff_state() { blend = eFalloff; } - IC void set(const CBlend& r) { *this = r; } + ECurvature blend_state() const { return blend; } + void set_free_state() { blend = eFREE_SLOT; } + void set_accrue_state() { blend = eAccrue; } + void set_falloff_state() { blend = eFalloff; } + void set(const CBlend& r) { *this = r; } #ifdef DEBUG CBlend() : @@ -72,7 +72,7 @@ class CBlend blendAmount(0), timeCurrent(0), timeTotal(0), motionID(), bone_or_part(0), channel(0), blend(eFREE_SLOT), blendAccrue(0), blendFalloff(0), blendPower(0), speed(0), playing(0), stop_at_end_callback(0), stop_at_end(0), fall_at_end(0), - Callback(0), CallbackParam(0), dwFrame(0) + Callback(nullptr), CallbackParam(nullptr), dwFrame(0) { } diff --git a/src/Include/xrRender/animation_motion.h b/src/Include/xrRender/animation_motion.h index 611c1094f66..f163ba587bc 100644 --- a/src/Include/xrRender/animation_motion.h +++ b/src/Include/xrRender/animation_motion.h @@ -37,7 +37,7 @@ struct MotionID if (valid()) return &MotionID::get; else - return 0; + return nullptr; // return(!valid()?0:&MotionID::get); } }; diff --git a/src/Layers/xrRender/Animation.h b/src/Layers/xrRender/Animation.h index 36d8e95164f..51cf209b5f9 100644 --- a/src/Layers/xrRender/Animation.h +++ b/src/Layers/xrRender/Animation.h @@ -37,8 +37,9 @@ class channels void set_factor(u16 channel, float factor); public: - IC const channal_rule& rule(u16 channel) { return rules[channel]; } - IC void get_def(u16 channel, channel_def& def) + const channal_rule& rule(u16 channel) { return rules[channel]; } + + void get_def(u16 channel, channel_def& def) { VERIFY(channel < max); def.rule = rules[channel]; diff --git a/src/Layers/xrRender/AnimationKeyCalculate.h b/src/Layers/xrRender/AnimationKeyCalculate.h index 96e148e60fc..8479dc48cb6 100644 --- a/src/Layers/xrRender/AnimationKeyCalculate.h +++ b/src/Layers/xrRender/AnimationKeyCalculate.h @@ -14,7 +14,7 @@ struct ConsistantKey const CKey* K; float w; - IC void set(const CKey* _K, float _w) + void set(const CKey* _K, float _w) { K = _K; w = _w; diff --git a/src/Layers/xrRender/Blender_Model_EbB.cpp b/src/Layers/xrRender/Blender_Model_EbB.cpp index e37334f26b5..958a082652b 100644 --- a/src/Layers/xrRender/Blender_Model_EbB.cpp +++ b/src/Layers/xrRender/Blender_Model_EbB.cpp @@ -91,8 +91,8 @@ void CBlender_Model_EbB::Compile(CBlender_Compile& C) } else { - LPCSTR vsname = 0; - LPCSTR psname = 0; + LPCSTR vsname = nullptr; + LPCSTR psname = nullptr; switch (C.iElement) { case SE_R1_NORMAL_HQ: diff --git a/src/Layers/xrRender/Blender_Recorder_R2.cpp b/src/Layers/xrRender/Blender_Recorder_R2.cpp index cd969f7372c..0d2677ae824 100644 --- a/src/Layers/xrRender/Blender_Recorder_R2.cpp +++ b/src/Layers/xrRender/Blender_Recorder_R2.cpp @@ -179,7 +179,7 @@ void CBlender_Compile::r_End() dest.constants = RImplementation.Resources->_CreateConstantTable(ctable); dest.state = RImplementation.Resources->_CreateState(RS.GetContainer()); dest.T = RImplementation.Resources->_CreateTextureList(passTextures); - dest.C = 0; + dest.C = nullptr; #ifdef _EDITOR dest.M = 0; #endif diff --git a/src/Layers/xrRender/ColorMapManager.cpp b/src/Layers/xrRender/ColorMapManager.cpp index 7e0fb8f3f1b..735763ab373 100644 --- a/src/Layers/xrRender/ColorMapManager.cpp +++ b/src/Layers/xrRender/ColorMapManager.cpp @@ -43,6 +43,6 @@ void ColorMapManager::UpdateTexture(const shared_str& strTexName, int iTex) } else { - m_CMap[iTex]->surface_set(0); + m_CMap[iTex]->surface_set(nullptr); } } diff --git a/src/Layers/xrRender/ColorMapManager.h b/src/Layers/xrRender/ColorMapManager.h index 87ba40c0fde..a7c04cee5be 100644 --- a/src/Layers/xrRender/ColorMapManager.h +++ b/src/Layers/xrRender/ColorMapManager.h @@ -16,15 +16,13 @@ class ColorMapManager private: void UpdateTexture(const shared_str& strTexName, int iTex); -private: struct str_pred : public std::binary_function { - IC bool operator()(const shared_str& x, const shared_str& y) const { return x < y; } + bool operator()(const shared_str& x, const shared_str& y) const { return x < y; } }; DEFINE_MAP_PRED(shared_str, ref_texture, map_Tex, map_TexIt, str_pred); -private: ref_texture m_CMap[2]; shared_str m_strCMap[2]; diff --git a/src/Layers/xrRender/D3DUtils.cpp b/src/Layers/xrRender/D3DUtils.cpp index 13ccf5f5269..5b97f4fcc09 100644 --- a/src/Layers/xrRender/D3DUtils.cpp +++ b/src/Layers/xrRender/D3DUtils.cpp @@ -115,14 +115,14 @@ void SPrimitiveBuffer::CreateFromData( // TODO: DX10: Implement SPrimitiveBuffer::CreateFromData for DX10 // VERIFY(!"SPrimitiveBuffer::CreateFromData not implemented for dx10"); #else // USE_DX10 - ID3DVertexBuffer* pVB = 0; - ID3DIndexBuffer* pIB = 0; + ID3DVertexBuffer* pVB = nullptr; + ID3DIndexBuffer* pIB = nullptr; p_cnt = _p_cnt; p_type = _pt; v_cnt = _v_cnt; i_cnt = _i_cnt; u32 stride = D3DXGetFVFVertexSize(FVF); - R_CHK(HW.pDevice->CreateVertexBuffer(v_cnt * stride, D3DUSAGE_WRITEONLY, 0, D3DPOOL_MANAGED, &pVB, 0)); + R_CHK(HW.pDevice->CreateVertexBuffer(v_cnt * stride, D3DUSAGE_WRITEONLY, 0, D3DPOOL_MANAGED, &pVB, nullptr)); HW.stats_manager.increment_stats_vb(pVB); u8* bytes; R_CHK(pVB->Lock(0, 0, (LPVOID*)&bytes, 0)); @@ -926,7 +926,7 @@ void CDrawUtilities::DrawFace( static const u32 MAX_VERT_COUNT = 0xFFFF; void CDrawUtilities::DD_DrawFace_begin(BOOL bWire) { - VERIFY(m_DD_pv_start == 0); + VERIFY(m_DD_pv_start == nullptr); m_DD_wire = bWire; m_DD_pv_start = (FVF::L*)RCache.Vertex.Lock(MAX_VERT_COUNT, vs_L->vb_stride, m_DD_base); m_DD_pv = m_DD_pv_start; @@ -959,7 +959,7 @@ void CDrawUtilities::DD_DrawFace_push(const Fvector& p0, const Fvector& p1, cons void CDrawUtilities::DD_DrawFace_end() { DD_DrawFace_flush(FALSE); - m_DD_pv_start = 0; + m_DD_pv_start = nullptr; } //---------------------------------------------------- diff --git a/src/Layers/xrRender/D3DUtils.h b/src/Layers/xrRender/D3DUtils.h index 048c079d738..34656b471ec 100644 --- a/src/Layers/xrRender/D3DUtils.h +++ b/src/Layers/xrRender/D3DUtils.h @@ -26,10 +26,10 @@ struct SPrimitiveBuffer TOnRender OnRender; void xr_stdcall RenderDIP() { DU_DRAW_DIP(p_type, pGeom, 0, 0, v_cnt, 0, p_cnt); } void xr_stdcall RenderDP() { DU_DRAW_DP(p_type, pGeom, 0, p_cnt); } -public: - SPrimitiveBuffer() : OnRender(0), pGeom(0) { ; } + + SPrimitiveBuffer() : OnRender(nullptr), pGeom(nullptr) {} void CreateFromData( - D3DPRIMITIVETYPE _pt, u32 _p_cnt, u32 FVF, LPVOID vertices, u32 _v_cnt, u16* indices = 0, u32 _i_cnt = 0); + D3DPRIMITIVETYPE _pt, u32 _p_cnt, u32 FVF, LPVOID vertices, u32 _v_cnt, u16* indices = nullptr, u32 _i_cnt = 0); void Destroy(); void Render() { OnRender(); } }; @@ -68,16 +68,15 @@ class ECORE_API CDrawUtilities : public CDUInterface, public pureRender void DD_DrawFace_push(const Fvector& p0, const Fvector& p1, const Fvector& p2, u32 clr); void DD_DrawFace_end(); -public: CDrawUtilities() { - vs_L = 0; - vs_TL = 0; - vs_LIT = 0; - m_DD_pv = 0; - m_DD_pv_start = 0; + vs_L = nullptr; + vs_TL = nullptr; + vs_LIT = nullptr; + m_DD_pv = nullptr; + m_DD_pv_start = nullptr; m_DD_base = 0; - m_Font = 0; + m_Font = nullptr; } void OnDeviceCreate(); diff --git a/src/Layers/xrRender/DetailFormat.h b/src/Layers/xrRender/DetailFormat.h index d568564812a..c48fee4ec99 100644 --- a/src/Layers/xrRender/DetailFormat.h +++ b/src/Layers/xrRender/DetailFormat.h @@ -73,10 +73,11 @@ class DetailHeader size_x = size_z = u32(-1); } - IC u32 version() const { return _version; } - IC float fromSlotX(int x) const { return (x - offs_x) * DETAIL_SLOT_SIZE + DETAIL_SLOT_SIZE_2; } - IC float fromSlotZ(int z) const { return (z - offs_z) * DETAIL_SLOT_SIZE + DETAIL_SLOT_SIZE_2; } - IC void GetSlotRect(Frect& rect, int sx, int sz) const + u32 version() const { return _version; } + float fromSlotX(int x) const { return (x - offs_x) * DETAIL_SLOT_SIZE + DETAIL_SLOT_SIZE_2; } + float fromSlotZ(int z) const { return (z - offs_z) * DETAIL_SLOT_SIZE + DETAIL_SLOT_SIZE_2; } + + void GetSlotRect(Frect& rect, int sx, int sz) const { float x = fromSlotX(sx); float z = fromSlotZ(sz); @@ -86,12 +87,13 @@ class DetailHeader rect.y2 = z + DETAIL_SLOT_SIZE_2 - EPS_L; } - IC u32 object_count() const { return obj_count; } - IC u32 x_size() const { return size_x; } - IC u32 z_size() const { return size_z; } - IC u32 x_offs() const { return offs_x; } - IC u32 z_offs() const { return offs_z; } - IC u32 slot_index(int _x, int _z) const + u32 object_count() const { return obj_count; } + u32 x_size() const { return size_x; } + u32 z_size() const { return size_z; } + u32 x_offs() const { return offs_x; } + u32 z_offs() const { return offs_z; } + + u32 slot_index(int _x, int _z) const { u32 ret = _z * size_x + _x; int xx, zz; @@ -101,7 +103,7 @@ class DetailHeader return ret; } - IC void slot_x_z(u32 idx, int& _x, int& _z) const + void slot_x_z(u32 idx, int& _x, int& _z) const { VERIFY(idx < slot_count()); _z = idx / size_x; @@ -110,9 +112,9 @@ class DetailHeader VERIFY(u32(_x) < x_size()); } - IC u32 slot_count() const { return size_x * size_z; } - IC float slot_min_x(int _x) const { return (int(_x) - int(offs_x)) * DETAIL_SLOT_SIZE; } - IC float slot_min_z(int _z) const { return (int(_z) - int(offs_z)) * DETAIL_SLOT_SIZE; } + u32 slot_count() const { return size_x * size_z; } + float slot_min_x(int _x) const { return (int(_x) - int(offs_x)) * DETAIL_SLOT_SIZE; } + float slot_min_z(int _z) const { return (int(_z) - int(offs_z)) * DETAIL_SLOT_SIZE; } }; struct DetailPalette diff --git a/src/Layers/xrRender/DetailManager.cpp b/src/Layers/xrRender/DetailManager.cpp index 6219e3bd238..d82058148c7 100644 --- a/src/Layers/xrRender/DetailManager.cpp +++ b/src/Layers/xrRender/DetailManager.cpp @@ -76,13 +76,13 @@ void CDetailManager::SSwingValue::lerp(const SSwingValue& A, const SSwingValue& // XXX stats: add to statistics CDetailManager::CDetailManager() : xrc("detail manager") { - dtFS = 0; - dtSlots = 0; - soft_Geom = 0; - hw_Geom = 0; + dtFS = nullptr; + dtSlots = nullptr; + soft_Geom = nullptr; + hw_Geom = nullptr; hw_BatchSize = 0; - hw_VB = 0; - hw_IB = 0; + hw_VB = nullptr; + hw_IB = nullptr; m_time_rot_1 = 0; m_time_rot_2 = 0; m_time_pos = 0; @@ -108,7 +108,7 @@ void CDetailManager::Load() // Open file stream if (!FS.exist("$level$", "level.details")) { - dtFS = NULL; + dtFS = nullptr; return; } @@ -179,6 +179,7 @@ void CDetailManager::Unload() (*it)->Unload(); xr_delete(*it); } + objects.clear(); m_visibles[0].clear(); m_visibles[1].clear(); @@ -330,7 +331,7 @@ void CDetailManager::UpdateVisibleM() void CDetailManager::Render() { #ifndef _EDITOR - if (0 == dtFS) + if (nullptr == dtFS) return; if (!psDeviceFlags.is(rsDetails)) return; @@ -362,9 +363,9 @@ void CDetailManager::Render() void __stdcall CDetailManager::MT_CALC() { #ifndef _EDITOR - if (0 == RImplementation.Details) + if (nullptr == RImplementation.Details) return; // possibly deleted - if (0 == dtFS) + if (nullptr == dtFS) return; if (!psDeviceFlags.is(rsDetails)) return; diff --git a/src/Layers/xrRender/DetailManager.h b/src/Layers/xrRender/DetailManager.h index 5a4a6da4e14..e3e466fad53 100644 --- a/src/Layers/xrRender/DetailManager.h +++ b/src/Layers/xrRender/DetailManager.h @@ -122,13 +122,11 @@ class ECORE_API CDetailManager float m_time_pos; float m_global_time_old; -public: IReader* dtFS; DetailHeader dtH; DetailSlot* dtSlots; // note: pointer into VFS DetailSlot DS_empty; -public: DetailVec objects; vis_list m_visibles[3]; // 0=still, 1=Wave1, 2=Wave2 @@ -147,12 +145,11 @@ class ECORE_API CDetailManager void UpdateVisibleM(); void UpdateVisibleS(); -public: #ifdef _EDITOR virtual ObjectList* GetSnapList() = 0; #endif - IC bool UseVS() { return HW.Caps.geometry_major >= 1; } + bool UseVS() { return HW.Caps.geometry_major >= 1; } // Software processor ref_geom soft_Geom; void soft_Load(); @@ -182,7 +179,6 @@ class ECORE_API CDetailManager void hw_Render_dump(ref_constant array, u32 var_id, u32 lod_id, u32 c_base); #endif // USE_DX10 -public: // get unpacked slot DetailSlot& QueryDB(int sx, int sz); diff --git a/src/Layers/xrRender/DetailManager_VS.cpp b/src/Layers/xrRender/DetailManager_VS.cpp index a0c4feb1ab5..1912782962c 100644 --- a/src/Layers/xrRender/DetailManager_VS.cpp +++ b/src/Layers/xrRender/DetailManager_VS.cpp @@ -63,9 +63,9 @@ void CDetailManager::hw_Load_Geom() u32 dwUsage = D3DUSAGE_WRITEONLY; // Create VB/IB - R_CHK(HW.pDevice->CreateVertexBuffer(dwVerts * vSize, dwUsage, 0, D3DPOOL_MANAGED, &hw_VB, 0)); + R_CHK(HW.pDevice->CreateVertexBuffer(dwVerts * vSize, dwUsage, 0, D3DPOOL_MANAGED, &hw_VB, nullptr)); HW.stats_manager.increment_stats_vb(hw_VB); - R_CHK(HW.pDevice->CreateIndexBuffer(dwIndices * 2, dwUsage, D3DFMT_INDEX16, D3DPOOL_MANAGED, &hw_IB, 0)); + R_CHK(HW.pDevice->CreateIndexBuffer(dwIndices * 2, dwUsage, D3DFMT_INDEX16, D3DPOOL_MANAGED, &hw_IB, nullptr)); HW.stats_manager.increment_stats_ib(hw_IB); #endif // USE_DX10 diff --git a/src/Layers/xrRender/DetailModel.cpp b/src/Layers/xrRender/DetailModel.cpp index 58669f90cc8..9e8b6550fb7 100644 --- a/src/Layers/xrRender/DetailModel.cpp +++ b/src/Layers/xrRender/DetailModel.cpp @@ -8,12 +8,12 @@ void CDetail::Unload() if (vertices) { xr_free(vertices); - vertices = 0; + vertices = nullptr; } if (indices) { xr_free(indices); - indices = 0; + indices = nullptr; } shader.destroy(); } diff --git a/src/Layers/xrRender/ETextureParams.cpp b/src/Layers/xrRender/ETextureParams.cpp index 3cd0f36f0d8..1c73008099f 100644 --- a/src/Layers/xrRender/ETextureParams.cpp +++ b/src/Layers/xrRender/ETextureParams.cpp @@ -15,24 +15,24 @@ xr_token tparam_token[] = {{"Advanced", STextureParams::kMIPFilterAdvanced}, {"Bessel", STextureParams::kMIPFilterBessel}, {"Hanning", STextureParams::kMIPFilterHanning}, {"Hamming", STextureParams::kMIPFilterHamming}, - {"Blackman", STextureParams::kMIPFilterBlackman}, {"Kaiser", STextureParams::kMIPFilterKaiser}, {0, 0}}; + {"Blackman", STextureParams::kMIPFilterBlackman}, {"Kaiser", STextureParams::kMIPFilterKaiser}, {nullptr, 0}}; xr_token ttype_token[] = {{"2D Texture", STextureParams::ttImage}, {"Cube Map", STextureParams::ttCubeMap}, {"Bump Map", STextureParams::ttBumpMap}, {"Normal Map", STextureParams::ttNormalMap}, - {"Terrain", STextureParams::ttTerrain}, {0, 0}}; + {"Terrain", STextureParams::ttTerrain}, {nullptr, 0}}; xr_token tfmt_token[] = {{"DXT1", STextureParams::tfDXT1}, {"DXT1 Alpha", STextureParams::tfADXT1}, {"DXT3", STextureParams::tfDXT3}, {"DXT5", STextureParams::tfDXT5}, {"16 bit (1:5:5:5)", STextureParams::tf1555}, {"16 bit (5:6:5)", STextureParams::tf565}, {"32 bit (8:8:8:8)", STextureParams::tfRGBA}, {"8 bit (alpha)", STextureParams::tfA8}, {"8 bit (luminance)", STextureParams::tfL8}, - {"16 bit (alpha:luminance)", STextureParams::tfA8L8}, {0, 0}}; + {"16 bit (alpha:luminance)", STextureParams::tfA8L8}, {nullptr, 0}}; xr_token tmtl_token[] = {{"OrenNayar <-> Blin", STextureParams::tmOrenNayar_Blin}, {"Blin <-> Phong", STextureParams::tmBlin_Phong}, {"Phong <-> Metal", STextureParams::tmPhong_Metal}, - {"Metal <-> OrenNayar", STextureParams::tmMetal_OrenNayar}, {0, 0}}; + {"Metal <-> OrenNayar", STextureParams::tmMetal_OrenNayar}, {nullptr, 0}}; xr_token tbmode_token[] = {{"None", STextureParams::tbmNone}, {"Use", STextureParams::tbmUse}, - {"Use parallax", STextureParams::tbmUseParallax}, {0, 0}}; + {"Use parallax", STextureParams::tbmUseParallax}, {nullptr, 0}}; void STextureParams::Load(IReader& F) { diff --git a/src/Layers/xrRender/ETextureParams.h b/src/Layers/xrRender/ETextureParams.h index f3adabd1d9d..81d95f222ab 100644 --- a/src/Layers/xrRender/ETextureParams.h +++ b/src/Layers/xrRender/ETextureParams.h @@ -114,9 +114,10 @@ struct ECORE_API STextureParams shared_str ext_normal_map_name; STextureParams() { Clear(); } - IC void destroy_shared_str(shared_str& object) { object.~shared_str(); } - IC void construct_shared_str(shared_str& object) { ::new (&object) shared_str(); } - IC void Clear() + void destroy_shared_str(shared_str& object) { object.~shared_str(); } + void construct_shared_str(shared_str& object) { ::new (&object) shared_str(); } + + void Clear() { destroy_shared_str(detail_name); destroy_shared_str(bump_name); @@ -138,12 +139,13 @@ struct ECORE_API STextureParams bump_virtual_height = 0.05f; } - IC BOOL HasAlpha() + BOOL HasAlpha() { // исходная текстура содержит альфа канал return flags.is(flHasAlpha); } - IC BOOL HasAlphaChannel() // игровая текстура содержит альфа канал + + BOOL HasAlphaChannel() // игровая текстура содержит альфа канал { switch (fmt) { diff --git a/src/Layers/xrRender/FBasicVisual.cpp b/src/Layers/xrRender/FBasicVisual.cpp index bbabb9f70af..2522e131818 100644 --- a/src/Layers/xrRender/FBasicVisual.cpp +++ b/src/Layers/xrRender/FBasicVisual.cpp @@ -25,7 +25,7 @@ IRender_Mesh::~IRender_Mesh() dxRender_Visual::dxRender_Visual() { Type = 0; - shader = 0; + shader = nullptr; vis.clear(); } diff --git a/src/Layers/xrRender/FBasicVisual.h b/src/Layers/xrRender/FBasicVisual.h index 25f5be461dc..a3df97ae4fe 100644 --- a/src/Layers/xrRender/FBasicVisual.h +++ b/src/Layers/xrRender/FBasicVisual.h @@ -31,8 +31,8 @@ struct IRender_Mesh IRender_Mesh() { - p_rm_Vertices = 0; - p_rm_Indices = 0; + p_rm_Vertices = nullptr; + p_rm_Indices = nullptr; } virtual ~IRender_Mesh(); diff --git a/src/Layers/xrRender/FProgressive.cpp b/src/Layers/xrRender/FProgressive.cpp index ee377d3a32b..65307f602ba 100644 --- a/src/Layers/xrRender/FProgressive.cpp +++ b/src/Layers/xrRender/FProgressive.cpp @@ -14,7 +14,7 @@ FProgressive::FProgressive() : Fvisual() { - xSWI = 0; + xSWI = nullptr; last_lod = 0; } diff --git a/src/Layers/xrRender/FSkinned.cpp b/src/Layers/xrRender/FSkinned.cpp index e1a1620d282..e580da37044 100644 --- a/src/Layers/xrRender/FSkinned.cpp +++ b/src/Layers/xrRender/FSkinned.cpp @@ -606,9 +606,9 @@ void CSkeletonX_ext::_Load_hw(Fvisual& V, void* _verts_) { u32 vStride = D3DXGetDeclVertexSize(dwDecl_01W, 0); VERIFY(vStride == sizeof(vertHW_1W)); - BYTE* bytes = 0; + BYTE* bytes = nullptr; VERIFY(NULL == V.p_rm_Vertices); - R_CHK(HW.pDevice->CreateVertexBuffer(V.vCount * vStride, dwUsage, 0, D3DPOOL_MANAGED, &V.p_rm_Vertices, 0)); + R_CHK(HW.pDevice->CreateVertexBuffer(V.vCount * vStride, dwUsage, 0, D3DPOOL_MANAGED, &V.p_rm_Vertices, nullptr)); HW.stats_manager.increment_stats_vb(V.p_rm_Vertices); R_CHK(V.p_rm_Vertices->Lock(0, 0, (void**)&bytes, 0)); vertHW_1W* dst = (vertHW_1W*)bytes; @@ -629,9 +629,9 @@ void CSkeletonX_ext::_Load_hw(Fvisual& V, void* _verts_) { u32 vStride = D3DXGetDeclVertexSize(dwDecl_2W, 0); VERIFY(vStride == sizeof(vertHW_2W)); - BYTE* bytes = 0; + BYTE* bytes = nullptr; VERIFY(NULL == V.p_rm_Vertices); - R_CHK(HW.pDevice->CreateVertexBuffer(V.vCount * vStride, dwUsage, 0, D3DPOOL_MANAGED, &V.p_rm_Vertices, 0)); + R_CHK(HW.pDevice->CreateVertexBuffer(V.vCount * vStride, dwUsage, 0, D3DPOOL_MANAGED, &V.p_rm_Vertices, nullptr)); HW.stats_manager.increment_stats_vb(V.p_rm_Vertices); R_CHK(V.p_rm_Vertices->Lock(0, 0, (void**)&bytes, 0)); vertHW_2W* dst = (vertHW_2W*)bytes; @@ -653,9 +653,9 @@ void CSkeletonX_ext::_Load_hw(Fvisual& V, void* _verts_) { u32 vStride = D3DXGetDeclVertexSize(dwDecl_3W, 0); VERIFY(vStride == sizeof(vertHW_3W)); - BYTE* bytes = 0; + BYTE* bytes = nullptr; VERIFY(NULL == V.p_rm_Vertices); - R_CHK(HW.pDevice->CreateVertexBuffer(V.vCount * vStride, dwUsage, 0, D3DPOOL_MANAGED, &V.p_rm_Vertices, 0)); + R_CHK(HW.pDevice->CreateVertexBuffer(V.vCount * vStride, dwUsage, 0, D3DPOOL_MANAGED, &V.p_rm_Vertices, nullptr)); HW.stats_manager.increment_stats_vb(V.p_rm_Vertices); R_CHK(V.p_rm_Vertices->Lock(0, 0, (void**)&bytes, 0)); vertHW_3W* dst = (vertHW_3W*)bytes; @@ -678,9 +678,9 @@ void CSkeletonX_ext::_Load_hw(Fvisual& V, void* _verts_) { u32 vStride = D3DXGetDeclVertexSize(dwDecl_4W, 0); VERIFY(vStride == sizeof(vertHW_4W)); - BYTE* bytes = 0; + BYTE* bytes = nullptr; VERIFY(NULL == V.p_rm_Vertices); - R_CHK(HW.pDevice->CreateVertexBuffer(V.vCount * vStride, dwUsage, 0, D3DPOOL_MANAGED, &V.p_rm_Vertices, 0)); + R_CHK(HW.pDevice->CreateVertexBuffer(V.vCount * vStride, dwUsage, 0, D3DPOOL_MANAGED, &V.p_rm_Vertices, nullptr)); HW.stats_manager.increment_stats_vb(V.p_rm_Vertices); R_CHK(V.p_rm_Vertices->Lock(0, 0, (void**)&bytes, 0)); vertHW_4W* dst = (vertHW_4W*)bytes; @@ -736,7 +736,7 @@ static void verify_vertex(const vertex_type& v, const Fvisual* V, const CKinemat void CSkeletonX_ext::_CollectBoneFaces(Fvisual* V, u32 iBase, u32 iCount) { - u16* indices = 0; + u16* indices = nullptr; #if defined(USE_DX10) || defined(USE_DX11) indices = *m_Indices; @@ -825,7 +825,7 @@ void CSkeletonX_ext::_CollectBoneFaces(Fvisual* V, u32 iBase, u32 iCount) case RM_SINGLE: case RM_SKINNING_1B: { - vertHW_1W* vertices = 0; + vertHW_1W* vertices = nullptr; R_CHK(V->p_rm_Vertices->Lock(V->vBase, V->vCount, (void**)&vertices, D3DLOCK_READONLY)); for (u32 idx = 0; idx < iCount; idx++) { @@ -838,7 +838,7 @@ void CSkeletonX_ext::_CollectBoneFaces(Fvisual* V, u32 iBase, u32 iCount) break; case RM_SKINNING_2B: { - vertHW_2W* vertices = 0; + vertHW_2W* vertices = nullptr; R_CHK(V->p_rm_Vertices->Lock(V->vBase, V->vCount, (void**)&vertices, D3DLOCK_READONLY)); for (u32 idx = 0; idx < iCount; idx++) @@ -854,7 +854,7 @@ void CSkeletonX_ext::_CollectBoneFaces(Fvisual* V, u32 iBase, u32 iCount) break; case RM_SKINNING_3B: { - vertHW_3W* vertices = 0; + vertHW_3W* vertices = nullptr; R_CHK(V->p_rm_Vertices->Lock(V->vBase, V->vCount, (void**)&vertices, D3DLOCK_READONLY)); for (u32 idx = 0; idx < iCount; idx++) @@ -872,7 +872,7 @@ void CSkeletonX_ext::_CollectBoneFaces(Fvisual* V, u32 iBase, u32 iCount) break; case RM_SKINNING_4B: { - vertHW_4W* vertices = 0; + vertHW_4W* vertices = nullptr; R_CHK(V->p_rm_Vertices->Lock(V->vBase, V->vCount, (void**)&vertices, D3DLOCK_READONLY)); for (u32 idx = 0; idx < iCount; idx++) @@ -909,7 +909,7 @@ void CSkeletonX_PM::AfterLoad(CKinematics* parent, u16 child_idx) } template -IC void get_pos_bones(const T& v, Fvector& p, CKinematics* Parent) +void get_pos_bones(const T& v, Fvector& p, CKinematics* Parent) { v.get_pos_bones(p, Parent); } @@ -1055,7 +1055,7 @@ BOOL CSkeletonX_ext::_PickBone(IKinematics::pick_result& r, float dist, const Fv CBoneData& BD = Parent->LL_GetData(bone_id); CBoneData::FacesVec* faces = &BD.child_faces[ChildIDX]; BOOL result = FALSE; - u16* indices = 0; + u16* indices = nullptr; #if defined(USE_DX10) || defined(USE_DX11) indices = *m_Indices; #else // USE_DX10 @@ -1359,7 +1359,7 @@ void CSkeletonX_ext::TEnumBoneVertices(vertHW_2W& verteses, u16 bone_id, u16* in */ template -IC void TEnumBoneVertices( +void TEnumBoneVertices( vertex_buffer_type vertices, u16* indices, CBoneData::FacesVec& faces, SEnumVerticesCallback& C) { for (CBoneData::FacesVecIt it = faces.begin(); it != faces.end(); it++) @@ -1379,7 +1379,7 @@ void CSkeletonX_ext::_EnumBoneVertices(SEnumVerticesCallback& C, Fvisual* V, u16 VERIFY(Parent && (ChildIDX != u16(-1))); CBoneData& BD = Parent->LL_GetData(bone_id); CBoneData::FacesVec* faces = &BD.child_faces[ChildIDX]; - u16* indices = 0; + u16* indices = nullptr; //R_CHK(V->pIndices->Lock(iBase, iCount, (void**)&indices, D3DLOCK_READONLY)); #if defined(USE_DX10) || defined(USE_DX11) @@ -1388,7 +1388,7 @@ void CSkeletonX_ext::_EnumBoneVertices(SEnumVerticesCallback& C, Fvisual* V, u16 #else USE_DX10 CHK_DX(V->p_rm_Indices->Lock(0, V->dwPrimitives * 3, (void**)&indices, D3DLOCK_READONLY)); // fill vertices - void* vertices = 0; + void* vertices = nullptr; if (RenderMode != RM_SKINNING_SOFT) CHK_DX(V->p_rm_Vertices->Lock(V->vBase, V->vCount, (void**)&vertices, D3DLOCK_READONLY)); switch (RenderMode) diff --git a/src/Layers/xrRender/FSkinned.h b/src/Layers/xrRender/FSkinned.h index ac1115964eb..a29f6120f11 100644 --- a/src/Layers/xrRender/FSkinned.h +++ b/src/Layers/xrRender/FSkinned.h @@ -1,54 +1,56 @@ // SkeletonX.h: interface for the CSkeletonX class. // ////////////////////////////////////////////////////////////////////// - +#pragma once #ifndef FSkinnedH #define FSkinnedH -#pragma once #include "FVisual.h" #include "FProgressive.h" -#ifdef _EDITOR #include "SkeletonX.h" -#else -#include "SkeletonX.h" -#endif struct SEnumVerticesCallback; class CSkeletonX_ext : public CSkeletonX // shared code for SkeletonX derivates { protected: virtual void _Load_hw(Fvisual& V, void* data); + virtual void _CollectBoneFaces(Fvisual* V, u32 iBase, u32 iCount); + void _EnumBoneVertices(SEnumVerticesCallback& C, Fvisual* V, u16 bone_id, u32 iBase, u32 iCount) const; + virtual void _FillVerticesHW1W(const Fmatrix& view, CSkeletonWallmark& wm, const Fvector& normal, float size, Fvisual* V, u16* indices, CBoneData::FacesVec& faces); + virtual void _FillVerticesHW2W(const Fmatrix& view, CSkeletonWallmark& wm, const Fvector& normal, float size, Fvisual* V, u16* indices, CBoneData::FacesVec& faces); + virtual void _FillVerticesHW3W(const Fmatrix& view, CSkeletonWallmark& wm, const Fvector& normal, float size, Fvisual* V, u16* indices, CBoneData::FacesVec& faces); + virtual void _FillVerticesHW4W(const Fmatrix& view, CSkeletonWallmark& wm, const Fvector& normal, float size, Fvisual* V, u16* indices, CBoneData::FacesVec& faces); + virtual void _FillVertices(const Fmatrix& view, CSkeletonWallmark& wm, const Fvector& normal, float size, Fvisual* V, u16 bone_id, u32 iBase, u32 iCount); virtual BOOL _PickBoneHW1W(IKinematics::pick_result& r, float range, const Fvector& S, const Fvector& D, Fvisual* V, u16* indices, CBoneData::FacesVec& faces); + virtual BOOL _PickBoneHW2W(IKinematics::pick_result& r, float range, const Fvector& S, const Fvector& D, Fvisual* V, u16* indices, CBoneData::FacesVec& faces); + virtual BOOL _PickBoneHW3W(IKinematics::pick_result& r, float range, const Fvector& S, const Fvector& D, Fvisual* V, u16* indices, CBoneData::FacesVec& faces); + virtual BOOL _PickBoneHW4W(IKinematics::pick_result& r, float range, const Fvector& S, const Fvector& D, Fvisual* V, u16* indices, CBoneData::FacesVec& faces); virtual BOOL _PickBone(IKinematics::pick_result& r, float range, const Fvector& S, const Fvector& D, Fvisual* V, u16 bone_id, u32 iBase, u32 iCount); - -public: }; class CSkeletonX_ST : public Fvisual, public CSkeletonX_ext { -private: typedef Fvisual inherited1; typedef CSkeletonX_ext inherited2; @@ -73,7 +75,6 @@ class CSkeletonX_ST : public Fvisual, public CSkeletonX_ext class CSkeletonX_PM : public FProgressive, public CSkeletonX_ext { -private: typedef FProgressive inherited1; typedef CSkeletonX_ext inherited2; diff --git a/src/Layers/xrRender/FTreeVisual.cpp b/src/Layers/xrRender/FTreeVisual.cpp index cf64e4b9d1f..23a8ad97bce 100644 --- a/src/Layers/xrRender/FTreeVisual.cpp +++ b/src/Layers/xrRender/FTreeVisual.cpp @@ -23,7 +23,7 @@ void FTreeVisual::Load(const char* N, IReader* data, u32 dwFlags) { dxRender_Visual::Load(N, data, dwFlags); - D3DVERTEXELEMENT9* vFormat = NULL; + D3DVERTEXELEMENT9* vFormat = nullptr; // read vertices R_ASSERT(data->find_chunk(OGF_GCONTAINER)); @@ -184,7 +184,7 @@ void FTreeVisual_ST::Copy(dxRender_Visual* pSrc) { inherited::Copy(pSrc); } //----------------------------------------------------------------------------------- FTreeVisual_PM::FTreeVisual_PM(void) { - pSWI = 0; + pSWI = nullptr; last_lod = 0; } FTreeVisual_PM::~FTreeVisual_PM(void) {} diff --git a/src/Layers/xrRender/FVF.h b/src/Layers/xrRender/FVF.h index f111bc561c0..237da5bd1dd 100644 --- a/src/Layers/xrRender/FVF.h +++ b/src/Layers/xrRender/FVF.h @@ -10,13 +10,15 @@ struct L { Fvector p; u32 color; - IC void set(const L& src) { *this = src; }; - IC void set(float x, float y, float z, u32 C) + void set(const L& src) { *this = src; }; + + void set(float x, float y, float z, u32 C) { p.set(x, y, z); color = C; } - IC void set(const Fvector& _p, u32 C) + + void set(const Fvector& _p, u32 C) { p.set(_p); color = C; @@ -28,13 +30,15 @@ struct V { Fvector p; Fvector2 t; - IC void set(const V& src) { *this = src; }; - IC void set(float x, float y, float z, float u, float v) + void set(const V& src) { *this = src; }; + + void set(float x, float y, float z, float u, float v) { p.set(x, y, z); t.set(u, v); } - IC void set(const Fvector& _p, float u, float v) + + void set(const Fvector& _p, float u, float v) { p.set(_p); t.set(u, v); @@ -47,14 +51,16 @@ struct LIT Fvector p; u32 color; Fvector2 t; - IC void set(const LIT& src) { *this = src; }; - IC void set(float x, float y, float z, u32 C, float u, float v) + void set(const LIT& src) { *this = src; }; + + void set(float x, float y, float z, u32 C, float u, float v) { p.set(x, y, z); color = C; t.set(u, v); } - IC void set(const Fvector& _p, u32 C, float u, float v) + + void set(const Fvector& _p, u32 C, float u, float v) { p.set(_p); color = C; @@ -67,15 +73,17 @@ struct TL0uv { Fvector4 p; u32 color; - IC void set(const TL0uv& src) { *this = src; }; - IC void set(float x, float y, u32 c) { set(x, y, .0001f, .9999f, c); }; - IC void set(int x, int y, u32 c) { set(float(x), float(y), .0001f, .9999f, c); }; - IC void set(float x, float y, float z, float w, u32 c) + void set(const TL0uv& src) { *this = src; }; + void set(float x, float y, u32 c) { set(x, y, .0001f, .9999f, c); }; + void set(int x, int y, u32 c) { set(float(x), float(y), .0001f, .9999f, c); }; + + void set(float x, float y, float z, float w, u32 c) { p.set(x, y, z, w); color = c; }; - IC void transform(const Fvector& v, const Fmatrix& matSet) + + void transform(const Fvector& v, const Fmatrix& matSet) { // Transform it through the matrix set. Takes in mean projection. // Finally, scale the vertices to screen coords. @@ -94,18 +102,20 @@ struct TL Fvector4 p; u32 color; Fvector2 uv; - IC void set(const TL& src) { *this = src; }; - IC void set(float x, float y, u32 c, Fvector2& t) { set(x, y, .0001f, .9999f, c, t.x, t.y); }; - IC void set(float x, float y, u32 c, float u, float v) { set(x, y, .0001f, .9999f, c, u, v); }; - IC void set(int x, int y, u32 c, float u, float v) { set(float(x), float(y), .0001f, .9999f, c, u, v); }; - IC void set(float x, float y, float z, float w, u32 c, float u, float v) + void set(const TL& src) { *this = src; }; + void set(float x, float y, u32 c, Fvector2& t) { set(x, y, .0001f, .9999f, c, t.x, t.y); }; + void set(float x, float y, u32 c, float u, float v) { set(x, y, .0001f, .9999f, c, u, v); }; + void set(int x, int y, u32 c, float u, float v) { set(float(x), float(y), .0001f, .9999f, c, u, v); }; + + void set(float x, float y, float z, float w, u32 c, float u, float v) { p.set(x, y, z, w); color = c; uv.x = u; uv.y = v; }; - IC void transform(const Fvector& v, const Fmatrix& matSet) + + void transform(const Fvector& v, const Fmatrix& matSet) { // Transform it through the matrix set. Takes in mean projection. // Finally, scale the vertices to screen coords. @@ -124,24 +134,29 @@ struct TL2uv Fvector4 p; u32 color; Fvector2 uv[2]; - IC void set(const TL2uv& src) { *this = src; }; - IC void set(float x, float y, u32 c, Fvector2& t0, Fvector2& t1) + void set(const TL2uv& src) { *this = src; }; + + void set(float x, float y, u32 c, Fvector2& t0, Fvector2& t1) { set(x, y, .0001f, .9999f, c, t0.x, t0.y, t1.x, t1.y); }; - IC void set(float x, float y, float z, float w, u32 c, Fvector2& t0, Fvector2& t1) + + void set(float x, float y, float z, float w, u32 c, Fvector2& t0, Fvector2& t1) { set(x, y, z, w, c, t0.x, t0.y, t1.x, t1.y); }; - IC void set(float x, float y, u32 c, float u, float v, float u2, float v2) + + void set(float x, float y, u32 c, float u, float v, float u2, float v2) { set(x, y, .0001f, .9999f, c, u, v, u2, v2); }; - IC void set(int x, int y, u32 c, float u, float v, float u2, float v2) + + void set(int x, int y, u32 c, float u, float v, float u2, float v2) { set(float(x), float(y), .0001f, .9999f, c, u, v, u2, v2); }; - IC void set(float x, float y, float z, float w, u32 c, float u, float v, float u2, float v2) + + void set(float x, float y, float z, float w, u32 c, float u, float v, float u2, float v2) { p.set(x, y, z, w); color = c; @@ -150,7 +165,8 @@ struct TL2uv uv[1].x = u2; uv[1].y = v2; }; - IC void transform(const Fvector& v, const Fmatrix& matSet) + + void transform(const Fvector& v, const Fmatrix& matSet) { // Transform it through the matrix set. Takes in mean projection. // Finally, scale the vertices to screen coords. @@ -169,24 +185,29 @@ struct TL4uv Fvector4 p; u32 color; Fvector2 uv[4]; - IC void set(const TL4uv& src) { *this = src; }; - IC void set(float x, float y, u32 c, Fvector2& t0, Fvector2& t1) + void set(const TL4uv& src) { *this = src; }; + + void set(float x, float y, u32 c, Fvector2& t0, Fvector2& t1) { set(x, y, .0001f, .9999f, c, t0.x, t0.y, t1.x, t1.y); }; - IC void set(float x, float y, float z, float w, u32 c, Fvector2& t0, Fvector2& t1) + + void set(float x, float y, float z, float w, u32 c, Fvector2& t0, Fvector2& t1) { set(x, y, z, w, c, t0.x, t0.y, t1.x, t1.y); }; - IC void set(float x, float y, u32 c, float u, float v, float u2, float v2) + + void set(float x, float y, u32 c, float u, float v, float u2, float v2) { set(x, y, .0001f, .9999f, c, u, v, u2, v2); }; - IC void set(int x, int y, u32 c, float u, float v, float u2, float v2) + + void set(int x, int y, u32 c, float u, float v, float u2, float v2) { set(float(x), float(y), .0001f, .9999f, c, u, v, u2, v2); }; - IC void set(float x, float y, float z, float w, u32 c, float u, float v, float u2, float v2) + + void set(float x, float y, float z, float w, u32 c, float u, float v, float u2, float v2) { p.set(x, y, z, w); color = c; diff --git a/src/Layers/xrRender/FVisual.cpp b/src/Layers/xrRender/FVisual.cpp index 1ddf59e31a1..e8a3acd0158 100644 --- a/src/Layers/xrRender/FVisual.cpp +++ b/src/Layers/xrRender/FVisual.cpp @@ -14,7 +14,7 @@ // Construction/Destruction ////////////////////////////////////////////////////////////////////// -Fvisual::Fvisual() : dxRender_Visual() { m_fast = 0; } +Fvisual::Fvisual() : dxRender_Visual() { m_fast = nullptr; } Fvisual::~Fvisual() { HW.stats_manager.decrement_stats_vb(p_rm_Vertices); @@ -28,7 +28,7 @@ void Fvisual::Load(const char* N, IReader* data, u32 dwFlags) dxRender_Visual::Load(N, data, dwFlags); D3DVERTEXELEMENT9 dcl[MAX_FVF_DECL_SIZE]; - D3DVERTEXELEMENT9* vFormat = 0; + D3DVERTEXELEMENT9* vFormat = nullptr; dwPrimitives = 0; BOOL loaded_v = false; @@ -127,9 +127,9 @@ void Fvisual::Load(const char* N, IReader* data, u32 dwFlags) #else // USE_DX10 BOOL bSoft = HW.Caps.geometry.bSoftware; u32 dwUsage = D3DUSAGE_WRITEONLY | (bSoft ? D3DUSAGE_SOFTWAREPROCESSING : 0); - BYTE* bytes = 0; + BYTE* bytes = nullptr; VERIFY(NULL == p_rm_Vertices); - R_CHK(HW.pDevice->CreateVertexBuffer(vCount * vStride, dwUsage, 0, D3DPOOL_MANAGED, &p_rm_Vertices, 0)); + R_CHK(HW.pDevice->CreateVertexBuffer(vCount * vStride, dwUsage, 0, D3DPOOL_MANAGED, &p_rm_Vertices, nullptr)); HW.stats_manager.increment_stats_vb(p_rm_Vertices); R_CHK(p_rm_Vertices->Lock(0, 0, (void**)&bytes, 0)); CopyMemory(bytes, data->pointer(), vCount * vStride); @@ -181,11 +181,11 @@ void Fvisual::Load(const char* N, IReader* data, u32 dwFlags) BOOL bSoft = HW.Caps.geometry.bSoftware; u32 dwUsage = /*D3DUSAGE_WRITEONLY |*/ ( bSoft ? D3DUSAGE_SOFTWAREPROCESSING : 0); // indices are read in model-wallmarks code - BYTE* bytes = 0; + BYTE* bytes = nullptr; VERIFY(NULL == p_rm_Indices); R_CHK( - HW.pDevice->CreateIndexBuffer(iCount * 2, dwUsage, D3DFMT_INDEX16, D3DPOOL_MANAGED, &p_rm_Indices, 0)); + HW.pDevice->CreateIndexBuffer(iCount * 2, dwUsage, D3DFMT_INDEX16, D3DPOOL_MANAGED, &p_rm_Indices, nullptr)); HW.stats_manager.increment_stats_ib(p_rm_Indices); R_CHK(p_rm_Indices->Lock(0, 0, (void**)&bytes, 0)); CopyMemory(bytes, data->pointer(), iCount * 2); diff --git a/src/Layers/xrRender/HOM.cpp b/src/Layers/xrRender/HOM.cpp index 59e4dcaafb6..7501ef3b155 100644 --- a/src/Layers/xrRender/HOM.cpp +++ b/src/Layers/xrRender/HOM.cpp @@ -31,8 +31,8 @@ void __stdcall CHOM::MT_RENDER() CHOM::CHOM() : xrc("HOM") { bEnabled = FALSE; - m_pModel = 0; - m_pTris = 0; + m_pModel = nullptr; + m_pTris = nullptr; #ifdef DEBUG Device.seqRender.Add(this, REG_PRIORITY_LOW - 1000); #endif @@ -207,7 +207,7 @@ void CHOM::Render_DB(CFrustum& base) src.push_back(v[t.verts[1]]); src.push_back(v[t.verts[2]]); sPoly* P = clip.ClipPoly(src, dst); - if (0 == P) + if (nullptr == P) { T.skip = next; continue; diff --git a/src/Layers/xrRender/HW.cpp b/src/Layers/xrRender/HW.cpp index 12a20a826b7..3b02970576c 100644 --- a/src/Layers/xrRender/HW.cpp +++ b/src/Layers/xrRender/HW.cpp @@ -28,10 +28,10 @@ void free_render_mode_list() {} CHW HW; #ifdef DEBUG -IDirect3DStateBlock9* dwDebugSB = 0; +IDirect3DStateBlock9* dwDebugSB = nullptr; #endif -CHW::CHW() : hD3D(NULL), pD3D(NULL), pDevice(NULL), pBaseRT(NULL), pBaseZB(NULL), m_move_window(true) { ; } +CHW::CHW() : hD3D(nullptr), pD3D(nullptr), pDevice(nullptr), pBaseRT(nullptr), pBaseZB(nullptr), m_move_window(true) { ; } CHW::~CHW() { ; } void CHW::Reset(HWND hwnd) { @@ -313,7 +313,7 @@ void CHW::CreateDevice(HWND m_hWnd, bool move_window) "Please try to restart the game.\n" "Can not find matching format for back buffer."); FlushLog(); - MessageBox(NULL, "Failed to initialize graphics hardware.\nPlease try to restart the game.", "Error!", + MessageBox(nullptr, "Failed to initialize graphics hardware.\nPlease try to restart the game.", "Error!", MB_OK | MB_ICONERROR); TerminateProcess(GetCurrentProcess(), 0); } @@ -376,7 +376,7 @@ void CHW::CreateDevice(HWND m_hWnd, bool move_window) "Please try to restart the game.\n" "CreateDevice returned 0x%08x(D3DERR_DEVICELOST)", R); FlushLog(); - MessageBox(NULL, "Failed to initialize graphics hardware.\nPlease try to restart the game.", "Error!", + MessageBox(nullptr, "Failed to initialize graphics hardware.\nPlease try to restart the game.", "Error!", MB_OK | MB_ICONERROR); TerminateProcess(GetCurrentProcess(), 0); }; @@ -602,12 +602,12 @@ void free_vid_mode_list() xr_free(GlobalEnv.vid_mode_token[i].name); } xr_free(GlobalEnv.vid_mode_token); - GlobalEnv.vid_mode_token = NULL; + GlobalEnv.vid_mode_token = nullptr; } void fill_vid_mode_list(CHW* _hw) { - if (GlobalEnv.vid_mode_token != NULL) + if (GlobalEnv.vid_mode_token != nullptr) return; xr_vector _tmp; u32 cnt = _hw->pD3D->GetAdapterModeCount(_hw->DevAdapter, _hw->Caps.fTarget); @@ -627,7 +627,7 @@ void fill_vid_mode_list(CHW* _hw) if (_tmp.end() != std::find_if(_tmp.begin(), _tmp.end(), _uniq_mode(str))) continue; - _tmp.push_back(NULL); + _tmp.push_back(nullptr); _tmp.back() = xr_strdup(str); } @@ -636,7 +636,7 @@ void fill_vid_mode_list(CHW* _hw) GlobalEnv.vid_mode_token = xr_alloc(_cnt); GlobalEnv.vid_mode_token[_cnt - 1].id = -1; - GlobalEnv.vid_mode_token[_cnt - 1].name = NULL; + GlobalEnv.vid_mode_token[_cnt - 1].name = nullptr; #ifdef DEBUG Msg("Available video modes[%d]:", _tmp.size()); diff --git a/src/Layers/xrRender/HWCaps.cpp b/src/Layers/xrRender/HWCaps.cpp index 86f6e43c01a..c1c3b0eea56 100644 --- a/src/Layers/xrRender/HWCaps.cpp +++ b/src/Layers/xrRender/HWCaps.cpp @@ -183,7 +183,7 @@ void CHWCaps::Update() // Detect if stencil available bStencil = FALSE; - IDirect3DSurface9* surfZS = 0; + IDirect3DSurface9* surfZS = nullptr; D3DSURFACE_DESC surfDESC; CHK_DX(HW.pDevice->GetDepthStencilSurface(&surfZS)); R_ASSERT(surfZS); diff --git a/src/Layers/xrRender/LightTrack.cpp b/src/Layers/xrRender/LightTrack.cpp index 0344b1f8a62..05fd154099a 100644 --- a/src/Layers/xrRender/LightTrack.cpp +++ b/src/Layers/xrRender/LightTrack.cpp @@ -164,9 +164,9 @@ void CROS_impl::update(IRenderable* O) if (dwFrame == Device.dwFrame) return; dwFrame = Device.dwFrame; - if (0 == O) + if (nullptr == O) return; - if (0 == O->GetRenderData().visual) + if (nullptr == O->GetRenderData().visual) return; VERIFY(dynamic_cast(O->renderable_ROS())); // float dt = Device.fTimeDelta; diff --git a/src/Layers/xrRender/LightTrack.h b/src/Layers/xrRender/LightTrack.h index c47cdb7d31c..128f2e49fc4 100644 --- a/src/Layers/xrRender/LightTrack.h +++ b/src/Layers/xrRender/LightTrack.h @@ -90,7 +90,7 @@ class CROS_impl : public IRender_ObjectSpecific virtual float* get_luminocity_hemi_cube() { return hemi_cube_smooth; } void add(light* L); void update(IRenderable* O); - void update_smooth(IRenderable* O = 0); + void update_smooth(IRenderable* O = nullptr); ICF float get_hemi() { diff --git a/src/Layers/xrRender/ModelPool.cpp b/src/Layers/xrRender/ModelPool.cpp index a041068f579..204db7307b6 100644 --- a/src/Layers/xrRender/ModelPool.cpp +++ b/src/Layers/xrRender/ModelPool.cpp @@ -29,7 +29,7 @@ dxRender_Visual* CModelPool::Instance_Create(u32 type) { - dxRender_Visual* V = NULL; + dxRender_Visual* V = nullptr; // Check types switch (type) @@ -82,7 +82,7 @@ dxRender_Visual* CModelPool::Instance_Load(const char* N, BOOL allow_register) string_path name; // Add default ext if no ext at all - if (0 == strext(N)) + if (nullptr == strext(N)) strconcat(sizeof(name), name, N, ".ogf"); else xr_strcpy(name, sizeof(name), N); @@ -198,7 +198,7 @@ CModelPool::~CModelPool() dxRender_Visual* CModelPool::Instance_Find(LPCSTR N) { - dxRender_Visual* Model = 0; + dxRender_Visual* Model = nullptr; xr_vector::iterator I; for (I = Models.begin(); I != Models.end(); I++) { @@ -240,7 +240,7 @@ dxRender_Visual* CModelPool::Create(const char* name, IReader* data) // 1. Search for already loaded model (reference, base model) dxRender_Visual* Base = Instance_Find(low_name); - if (0 == Base) + if (nullptr == Base) { // 2. If not found bAllowChildrenDuplicate = FALSE; @@ -273,7 +273,7 @@ dxRender_Visual* CModelPool::CreateChild(LPCSTR name, IReader* data) // 1. Search for already loaded model dxRender_Visual* Base = Instance_Find(low_name); //. if (0==Base) Base = Instance_Load(name,data,FALSE); - if (0 == Base) + if (nullptr == Base) { if (data) Base = Instance_Load(low_name, data, FALSE); @@ -311,12 +311,12 @@ void CModelPool::DeleteInternal(dxRender_Visual*& V, BOOL bDiscard) xr_delete(V); } } - V = NULL; + V = nullptr; } void CModelPool::Delete(dxRender_Visual*& V, BOOL bDiscard) { - if (NULL == V) + if (nullptr == V) return; if (g_bRendering) { @@ -327,7 +327,7 @@ void CModelPool::Delete(dxRender_Visual*& V, BOOL bDiscard) { DeleteInternal(V, bDiscard); } - V = NULL; + V = nullptr; } void CModelPool::DeleteQueue() @@ -386,7 +386,7 @@ void CModelPool::Discard(dxRender_Visual*& V, BOOL b_complete) // Registry entry not-found - just special type of visual / particles / etc. xr_delete(V); } - V = NULL; + V = nullptr; } void CModelPool::Prefetch() @@ -482,7 +482,7 @@ void CModelPool::memory_stats(u32& vb_mem_video, u32& vb_mem_system, u32& ib_mem dxRender_Visual* ptr = it->model; Fvisual* vis_ptr = dynamic_cast(ptr); - if (vis_ptr == NULL) + if (vis_ptr == nullptr) continue; #if !defined(USE_DX10) && !defined(USE_DX11) D3DINDEXBUFFER_DESC IB_desc; diff --git a/src/Layers/xrRender/ModelPool.h b/src/Layers/xrRender/ModelPool.h index e207dcbc484..bebb7acca7a 100644 --- a/src/Layers/xrRender/ModelPool.h +++ b/src/Layers/xrRender/ModelPool.h @@ -14,12 +14,11 @@ struct SEmitter; // defs class ECORE_API CModelPool { -private: friend class CRender; struct str_pred : public std::binary_function { - IC bool operator()(const shared_str& x, const shared_str& y) const { return xr_strcmp(x, y) < 0; } + bool operator()(const shared_str& x, const shared_str& y) const { return xr_strcmp(x, y) < 0; } }; struct ModelDef { @@ -29,7 +28,7 @@ class ECORE_API CModelPool ModelDef() { refs = 0; - model = 0; + model = nullptr; } }; @@ -38,7 +37,6 @@ class ECORE_API CModelPool typedef xr_map REGISTRY; typedef REGISTRY::iterator REGISTRY_IT; -private: xr_vector Models; // Reference / Base xr_vector ModelsToDelete; // REGISTRY Registry; // Just pairing of pointer / Name @@ -61,7 +59,7 @@ class ECORE_API CModelPool dxRender_Visual* CreatePE(PS::CPEDef* source); dxRender_Visual* CreatePG(PS::CPGDef* source); - dxRender_Visual* Create(LPCSTR name, IReader* data = 0); + dxRender_Visual* Create(LPCSTR name, IReader* data = nullptr); dxRender_Visual* CreateChild(LPCSTR name, IReader* data); void Delete(dxRender_Visual*& V, BOOL bDiscard = FALSE); void Discard(dxRender_Visual*& V, BOOL b_complete); diff --git a/src/Layers/xrRender/NvTriStrip.h b/src/Layers/xrRender/NvTriStrip.h index 9e14b1bac4f..afa0f5c0410 100644 --- a/src/Layers/xrRender/NvTriStrip.h +++ b/src/Layers/xrRender/NvTriStrip.h @@ -30,7 +30,7 @@ struct PrimitiveGroup //////////////////////////////////////////////////////////////////////////////////////// - PrimitiveGroup() : type(PT_STRIP), numIndices(0), indices(NULL) {} + PrimitiveGroup() : type(PT_STRIP), numIndices(0), indices(nullptr) {} ~PrimitiveGroup() { if (indices) diff --git a/src/Layers/xrRender/NvTriStripObjects.cpp b/src/Layers/xrRender/NvTriStripObjects.cpp index 8b2ae3ad697..12e8d5f16dd 100644 --- a/src/Layers/xrRender/NvTriStripObjects.cpp +++ b/src/Layers/xrRender/NvTriStripObjects.cpp @@ -23,7 +23,7 @@ NvEdgeInfo* NvStripifier::FindEdgeInfo(NvEdgeInfoVec& edgeInfos, int v0, int v1) // and there is no order except how it was // first created. NvEdgeInfo* infoIter = edgeInfos[v0]; - while (infoIter != NULL) + while (infoIter != nullptr) { if (infoIter->m_v0 == v0) { @@ -41,7 +41,7 @@ NvEdgeInfo* NvStripifier::FindEdgeInfo(NvEdgeInfoVec& edgeInfos, int v0, int v1) infoIter = infoIter->m_nextV1; } } - return NULL; + return nullptr; } /////////////////////////////////////////////////////////////////////////////////////////// @@ -106,7 +106,7 @@ void NvStripifier::BuildStripifyInfo(NvFaceInfoVec& faceInfos, NvEdgeInfoVec& ed // grab the edge infos, creating them if they do not already exist NvEdgeInfo* edgeInfo01 = FindEdgeInfo(edgeInfos, v0, v1); - if (edgeInfo01 == NULL) + if (edgeInfo01 == nullptr) { // create the info edgeInfo01 = new NvEdgeInfo(v0, v1); @@ -122,7 +122,7 @@ void NvStripifier::BuildStripifyInfo(NvFaceInfoVec& faceInfos, NvEdgeInfoVec& ed } else { - if (edgeInfo01->m_face1 != NULL) + if (edgeInfo01->m_face1 != nullptr) ; // Msg("! WARNING: BuildStripifyInfo: > 2 triangles on an edge... uncertain consequences"); else @@ -131,7 +131,7 @@ void NvStripifier::BuildStripifyInfo(NvFaceInfoVec& faceInfos, NvEdgeInfoVec& ed // grab the edge infos, creating them if they do not already exist NvEdgeInfo* edgeInfo12 = FindEdgeInfo(edgeInfos, v1, v2); - if (edgeInfo12 == NULL) + if (edgeInfo12 == nullptr) { // create the info edgeInfo12 = new NvEdgeInfo(v1, v2); @@ -147,7 +147,7 @@ void NvStripifier::BuildStripifyInfo(NvFaceInfoVec& faceInfos, NvEdgeInfoVec& ed } else { - if (edgeInfo12->m_face1 != NULL) + if (edgeInfo12->m_face1 != nullptr) ; // Msg("! WARNING: BuildStripifyInfo: > 2 triangles on an edge... uncertain consequences"); else @@ -156,7 +156,7 @@ void NvStripifier::BuildStripifyInfo(NvFaceInfoVec& faceInfos, NvEdgeInfoVec& ed // grab the edge infos, creating them if they do not already exist NvEdgeInfo* edgeInfo20 = FindEdgeInfo(edgeInfos, v2, v0); - if (edgeInfo20 == NULL) + if (edgeInfo20 == nullptr) { // create the info edgeInfo20 = new NvEdgeInfo(v2, v0); @@ -172,7 +172,7 @@ void NvStripifier::BuildStripifyInfo(NvFaceInfoVec& faceInfos, NvEdgeInfoVec& ed } else { - if (edgeInfo20->m_face1 != NULL) + if (edgeInfo20->m_face1 != nullptr) ; // Msg("! WARNING: BuildStripifyInfo: > 2 triangles on an edge... uncertain consequences"); else @@ -193,11 +193,11 @@ int NvStripifier::FindStartPoint(NvFaceInfoVec& faceInfos, NvEdgeInfoVec& edgeIn { int ctr = 0; - if (FindOtherFace(edgeInfos, faceInfos[i]->m_v0, faceInfos[i]->m_v1, faceInfos[i]) == NULL) + if (FindOtherFace(edgeInfos, faceInfos[i]->m_v0, faceInfos[i]->m_v1, faceInfos[i]) == nullptr) ctr++; - if (FindOtherFace(edgeInfos, faceInfos[i]->m_v1, faceInfos[i]->m_v2, faceInfos[i]) == NULL) + if (FindOtherFace(edgeInfos, faceInfos[i]->m_v1, faceInfos[i]->m_v2, faceInfos[i]) == nullptr) ctr++; - if (FindOtherFace(edgeInfos, faceInfos[i]->m_v2, faceInfos[i]->m_v0, faceInfos[i]) == NULL) + if (FindOtherFace(edgeInfos, faceInfos[i]->m_v2, faceInfos[i]->m_v0, faceInfos[i]) == nullptr) ctr++; if (ctr > 1) return i; @@ -217,9 +217,9 @@ NvFaceInfo* NvStripifier::FindGoodResetPoint(NvFaceInfoVec& faceInfos, NvEdgeInf // we hop into different areas of the mesh to try to get // other large open spans done. Areas of small strips can // just be left to triangle lists added at the end. - NvFaceInfo* result = NULL; + NvFaceInfo* result = nullptr; - if (result == NULL) + if (result == nullptr) { int numFaces = faceInfos.size(); int startPoint; @@ -458,7 +458,7 @@ void NvStripInfo::Build(NvEdgeInfoVec& edgeInfos, NvFaceInfoVec& faceInfos) int nv1 = v2; NvFaceInfo* nextFace = NvStripifier::FindOtherFace(edgeInfos, nv0, nv1, m_startInfo.m_startFace); - while (nextFace != NULL && !IsMarked(nextFace)) + while (nextFace != nullptr && !IsMarked(nextFace)) { // this tests to see if a face is "unique", meaning that its vertices aren't already in the list // so, strips which "wrap-around" are not allowed @@ -495,7 +495,7 @@ void NvStripInfo::Build(NvEdgeInfoVec& edgeInfos, NvFaceInfoVec& faceInfos) nv0 = v1; nv1 = v0; nextFace = NvStripifier::FindOtherFace(edgeInfos, nv0, nv1, m_startInfo.m_startFace); - while (nextFace != NULL && !IsMarked(nextFace)) + while (nextFace != nullptr && !IsMarked(nextFace)) { // this tests to see if a face is "unique", meaning that its vertices aren't already in the list // so, strips which "wrap-around" are not allowed @@ -611,18 +611,18 @@ bool NvStripifier::FindTraversal( // if the strip was v0->v1 on the edge, then v1 will be a vertex in the next edge. int v = (strip->m_startInfo.m_toV1 ? strip->m_startInfo.m_startEdge->m_v1 : strip->m_startInfo.m_startEdge->m_v0); - NvFaceInfo* untouchedFace = NULL; + NvFaceInfo* untouchedFace = nullptr; NvEdgeInfo* edgeIter = edgeInfos[v]; - while (edgeIter != NULL) + while (edgeIter != nullptr) { NvFaceInfo* face0 = edgeIter->m_face0; NvFaceInfo* face1 = edgeIter->m_face1; - if ((face0 != NULL && !strip->IsInStrip(face0)) && face1 != NULL && !strip->IsMarked(face1)) + if ((face0 != nullptr && !strip->IsInStrip(face0)) && face1 != nullptr && !strip->IsMarked(face1)) { untouchedFace = face1; break; } - if ((face1 != NULL && !strip->IsInStrip(face1)) && face0 != NULL && !strip->IsMarked(face0)) + if ((face1 != nullptr && !strip->IsInStrip(face1)) && face0 != nullptr && !strip->IsMarked(face0)) { untouchedFace = face0; break; @@ -634,14 +634,14 @@ bool NvStripifier::FindTraversal( startInfo.m_startFace = untouchedFace; startInfo.m_startEdge = edgeIter; - if (edgeIter != NULL) + if (edgeIter != nullptr) { if (strip->SharesEdge(startInfo.m_startFace, edgeInfos)) startInfo.m_toV1 = (edgeIter->m_v0 == v); // note! used to be m_v1 else startInfo.m_toV1 = (edgeIter->m_v1 == v); } - return (startInfo.m_startFace != NULL); + return (startInfo.m_startFace != nullptr); } //////////////////////////////////////////////////////////////////////////////////////// @@ -900,7 +900,7 @@ void NvStripifier::Stripify(const WordVec& in_indices, const int in_cacheSize, c for (u32 i = 0; i < allEdgeInfos.size(); i++) { NvEdgeInfo* info = allEdgeInfos[i]; - while (info != NULL) + while (info != nullptr) { NvEdgeInfo* next = (info->m_v0 == int(i) ? info->m_nextV0 : info->m_nextV1); info->Unref(); @@ -927,7 +927,7 @@ void NvStripifier::SplitUpStripsAndOptimize( for (i = 0; i < allStrips.size(); i++) { NvStripInfo* currentStrip; - NvStripStartInfo startInfo(NULL, NULL, false); + NvStripStartInfo startInfo(nullptr, nullptr, false); if (allStrips[i]->m_faces.size() > threshold) { @@ -1139,17 +1139,17 @@ int NvStripifier::NumNeighbors(NvFaceInfo* face, NvEdgeInfoVec& edgeInfoVec) { int numNeighbors = 0; - if (FindOtherFace(edgeInfoVec, face->m_v0, face->m_v1, face) != NULL) + if (FindOtherFace(edgeInfoVec, face->m_v0, face->m_v1, face) != nullptr) { numNeighbors++; } - if (FindOtherFace(edgeInfoVec, face->m_v1, face->m_v2, face) != NULL) + if (FindOtherFace(edgeInfoVec, face->m_v1, face->m_v2, face) != nullptr) { numNeighbors++; } - if (FindOtherFace(edgeInfoVec, face->m_v2, face->m_v0, face) != NULL) + if (FindOtherFace(edgeInfoVec, face->m_v2, face->m_v0, face) != nullptr) { numNeighbors++; } @@ -1211,7 +1211,7 @@ void NvStripifier::FindAllStrips( // Try to find another good reset point. // If there are none to be found, we are done NvFaceInfo* nextFace = FindGoodResetPoint(allFaceInfos, allEdgeInfos); - if (nextFace == NULL) + if (nextFace == nullptr) { done = true; break; @@ -1279,7 +1279,7 @@ void NvStripifier::FindAllStrips( int experimentId = experiments[i][0]->m_experimentId; NvStripInfo* stripIter = experiments[i][0]; - NvStripStartInfo startInfo(NULL, NULL, false); + NvStripStartInfo startInfo(nullptr, nullptr, false); while (FindTraversal(allFaceInfos, allEdgeInfos, stripIter, startInfo)) { // create the _new strip info diff --git a/src/Layers/xrRender/NvTriStripObjects.h b/src/Layers/xrRender/NvTriStripObjects.h index 19c66c507d4..9fd29607915 100644 --- a/src/Layers/xrRender/NvTriStripObjects.h +++ b/src/Layers/xrRender/NvTriStripObjects.h @@ -57,10 +57,10 @@ class NvEdgeInfo { m_v0 = v0; m_v1 = v1; - m_face0 = NULL; - m_face1 = NULL; - m_nextV0 = NULL; - m_nextV1 = NULL; + m_face0 = nullptr; + m_face1 = nullptr; + m_nextV0 = nullptr; + m_nextV1 = nullptr; // we will appear in 2 lists. this is a good // way to make sure we _delete it the second time @@ -113,7 +113,7 @@ typedef xr_vector MyVertexVec; typedef xr_vector MyFaceVec; template -inline void SWAP(T& first, T& second) +void SWAP(T& first, T& second) { T temp = first; first = second; @@ -133,10 +133,11 @@ class NvStripInfo } // This is an experiment if the experiment id is >= 0 - inline bool IsExperiment() const { return m_experimentId >= 0; } - inline bool IsInStrip(const NvFaceInfo* faceInfo) const + bool IsExperiment() const { return m_experimentId >= 0; } + + bool IsInStrip(const NvFaceInfo* faceInfo) const { - if (faceInfo == NULL) + if (faceInfo == nullptr) return false; return (m_experimentId >= 0 ? faceInfo->m_testStripId == m_stripId : faceInfo->m_stripId == m_stripId); diff --git a/src/Layers/xrRender/PSLibrary.cpp b/src/Layers/xrRender/PSLibrary.cpp index 8f8777cb407..a1e3b4157eb 100644 --- a/src/Layers/xrRender/PSLibrary.cpp +++ b/src/Layers/xrRender/PSLibrary.cpp @@ -58,8 +58,7 @@ PS::PEDIt CPSLibrary::FindPEDIt(LPCSTR Name) PS::PEDIt I = std::lower_bound(m_PEDs.begin(), m_PEDs.end(), Name, ped_find_pred); if (I == m_PEDs.end() || (0 != xr_strcmp((*I)->m_Name, Name))) return m_PEDs.end(); - else - return I; + return I; #endif } @@ -82,8 +81,7 @@ PS::PGDIt CPSLibrary::FindPGDIt(LPCSTR Name) PS::PGDIt I = std::lower_bound(m_PGDs.begin(), m_PGDs.end(), Name, pgd_find_pred); if (I == m_PGDs.end() || (0 != xr_strcmp((*I)->m_Name, Name))) return m_PGDs.end(); - else - return I; + return I; #endif } @@ -134,7 +132,7 @@ bool CPSLibrary::Load2() FS.file_list(files, _path, FS_ListFiles, "*.pe,*.pg"); #ifdef _EDITOR - SPBItem* pb = NULL; + SPBItem* pb = nullptr; if (UI->m_bReady) pb = UI->ProgressStart(files.size(), "Loading particles..."); #endif diff --git a/src/Layers/xrRender/PSLibrary.h b/src/Layers/xrRender/PSLibrary.h index 722d90419be..0a1fd6786c8 100644 --- a/src/Layers/xrRender/PSLibrary.h +++ b/src/Layers/xrRender/PSLibrary.h @@ -46,12 +46,12 @@ class ECORE_API CPSLibrary : public particles_systems::library_interface PS::PGDIt FindPGDIt(LPCSTR name); // get object properties methods - IC PS::PEDIt FirstPED() { return m_PEDs.begin(); } - IC PS::PEDIt LastPED() { return m_PEDs.end(); } - IC PS::PGDIt FirstPGD() { return m_PGDs.begin(); } - IC PS::PGDIt LastPGD() { return m_PGDs.end(); } - PS::CPEDef* AppendPED(PS::CPEDef* src = 0); - PS::CPGDef* AppendPGD(PS::CPGDef* src = 0); + PS::PEDIt FirstPED() { return m_PEDs.begin(); } + PS::PEDIt LastPED() { return m_PEDs.end(); } + PS::PGDIt FirstPGD() { return m_PGDs.begin(); } + PS::PGDIt LastPGD() { return m_PGDs.end(); } + PS::CPEDef* AppendPED(PS::CPEDef* src = nullptr); + PS::CPGDef* AppendPGD(PS::CPGDef* src = nullptr); void Remove(LPCSTR name); void RenamePED(PS::CPEDef* src, LPCSTR new_name); void RenamePGD(PS::CPGDef* src, LPCSTR new_name); diff --git a/src/Layers/xrRender/ParticleEffect.cpp b/src/Layers/xrRender/ParticleEffect.cpp index 5fa64b9ecd1..811a40535c9 100644 --- a/src/Layers/xrRender/ParticleEffect.cpp +++ b/src/Layers/xrRender/ParticleEffect.cpp @@ -63,12 +63,12 @@ CParticleEffect::CParticleEffect() m_HandleActionList = ParticleManager()->CreateActionList(); VERIFY(m_HandleActionList >= 0); m_RT_Flags.zero(); - m_Def = 0; + m_Def = nullptr; m_fElapsedLimit = 0.f; m_MemDT = 0; m_InitialPosition.set(0, 0, 0); - m_DestroyCallback = 0; - m_CollisionCallback = 0; + m_DestroyCallback = nullptr; + m_CollisionCallback = nullptr; m_XFORM.identity(); } CParticleEffect::~CParticleEffect() diff --git a/src/Layers/xrRender/ParticleEffect.h b/src/Layers/xrRender/ParticleEffect.h index 91b6efabb68..e8737bd1e56 100644 --- a/src/Layers/xrRender/ParticleEffect.h +++ b/src/Layers/xrRender/ParticleEffect.h @@ -67,9 +67,9 @@ class ECORE_API CParticleEffect : public dxParticleCustom BOOL Compile(CPEDef* def); - IC CPEDef* GetDefinition() { return m_Def; } - IC int GetHandleEffect() { return m_HandleEffect; } - IC int GetHandleActionList() { return m_HandleActionList; } + CPEDef* GetDefinition() { return m_Def; } + int GetHandleEffect() { return m_HandleEffect; } + int GetHandleActionList() { return m_HandleActionList; } virtual void Play(); virtual void Stop(BOOL bDefferedStop = TRUE); virtual BOOL IsPlaying() { return m_RT_Flags.is(flRT_Playing); } diff --git a/src/Layers/xrRender/ParticleEffectDef.cpp b/src/Layers/xrRender/ParticleEffectDef.cpp index 9fafc206f66..c60d9f6ee02 100644 --- a/src/Layers/xrRender/ParticleEffectDef.cpp +++ b/src/Layers/xrRender/ParticleEffectDef.cpp @@ -21,7 +21,7 @@ CPEDef::CPEDef() { m_Frame.InitDefault(); m_MaxParticles = 0; - m_CachedShader = 0; + m_CachedShader = nullptr; m_fTimeLimit = 0.f; // collision m_fCollideOneMinusFriction = 1.f; @@ -135,7 +135,7 @@ void CPEDef::ExecuteCollision( #else collide::rq_result RQ; collide::rq_target RT = m_Flags.is(dfCollisionDyn) ? collide::rqtBoth : collide::rqtStatic; - if (g_pGameLevel->ObjectSpace.RayPick(m.posB, dir, dist, RT, RQ, NULL)) + if (g_pGameLevel->ObjectSpace.RayPick(m.posB, dir, dist, RT, RQ, nullptr)) { pt.mad(m.posB, dir, RQ.range); if (RQ.O) diff --git a/src/Layers/xrRender/ParticleEffectDef.h b/src/Layers/xrRender/ParticleEffectDef.h index 47034fb1394..054b2ddea81 100644 --- a/src/Layers/xrRender/ParticleEffectDef.h +++ b/src/Layers/xrRender/ParticleEffectDef.h @@ -38,10 +38,11 @@ struct SFrame m_iFrameCount = 16; m_fSpeed = 24.f; } - IC void CalculateTC(int frame, Fvector2& lt, Fvector2& rb) + + void CalculateTC(int frame, Fvector2& lt, Fvector2& rb) { - lt.x = (frame % m_iFrameDimX) * m_fTexSize.x; - lt.y = (frame / m_iFrameDimX) * m_fTexSize.y; + lt.x = frame % m_iFrameDimX * m_fTexSize.x; + lt.y = frame / m_iFrameDimX * m_fTexSize.y; rb.x = lt.x + m_fTexSize.x; rb.y = lt.y + m_fTexSize.y; } @@ -52,22 +53,22 @@ class ECORE_API CPEDef public: enum { - dfSprite = (1 << 0), + dfSprite = 1 << 0, //dfObject = (1 << 1), - dfFramed = (1 << 10), - dfAnimated = (1 << 11), - dfRandomFrame = (1 << 12), - dfRandomPlayback = (1 << 13), - dfTimeLimit = (1 << 14), - dfAlignToPath = (1 << 15), - dfCollision = (1 << 16), - dfCollisionDel = (1 << 17), - dfVelocityScale = (1 << 18), - dfCollisionDyn = (1 << 19), - dfWorldAlign = (1 << 20), - dfFaceAlign = (1 << 21), - dfCulling = (1 << 22), - dfCullCCW = (1 << 23), + dfFramed = 1 << 10, + dfAnimated = 1 << 11, + dfRandomFrame = 1 << 12, + dfRandomPlayback = 1 << 13, + dfTimeLimit = 1 << 14, + dfAlignToPath = 1 << 15, + dfCollision = 1 << 16, + dfCollisionDel = 1 << 17, + dfVelocityScale = 1 << 18, + dfCollisionDyn = 1 << 19, + dfWorldAlign = 1 << 20, + dfFaceAlign = 1 << 21, + dfCulling = 1 << 22, + dfCullCCW = 1 << 23, }; shared_str m_Name; Flags32 m_Flags; @@ -88,19 +89,17 @@ class ECORE_API CPEDef float m_fCollideResilience; float m_fCollideSqrCutoff; -public: BOOL SaveActionList(IWriter& F); BOOL LoadActionList(IReader& F); // execute void ExecuteAnimate(PAPI::Particle* particles, u32 p_cnt, float dt); void ExecuteCollision(PAPI::Particle* particles, u32 p_cnt, float dt, CParticleEffect* owner, CollisionCallback cb); -public: CPEDef(); ~CPEDef(); void SetName(LPCSTR name); - IC LPCSTR Name() const { return *m_Name; } + LPCSTR Name() const { return *m_Name; } void CreateShader(); void DestroyShader(); diff --git a/src/Layers/xrRender/ParticleGroup.cpp b/src/Layers/xrRender/ParticleGroup.cpp index bdc44641cca..792733cac1b 100644 --- a/src/Layers/xrRender/ParticleGroup.cpp +++ b/src/Layers/xrRender/ParticleGroup.cpp @@ -188,12 +188,12 @@ void CParticleGroup::SItem::Clear() // GlobalEnv.Render->model_Delete(*it); IRenderVisual* pVisual = smart_cast(*it); GlobalEnv.Render->model_Delete(pVisual); - *it = 0; + *it = nullptr; } // Igor: zero all pointers! Previous code didn't zero _source_ pointers, // just temporary ones. - _effect = 0; + _effect = nullptr; _children_related.clear_not_free(); _children_free.clear_not_free(); } @@ -278,6 +278,7 @@ void CParticleGroup::SItem::Stop(BOOL def_stop) static_cast(*it)->Stop(def_stop); for (it = _children_free.begin(); it != _children_free.end(); it++) static_cast(*it)->Stop(def_stop); + // and delete if !deffered if (!def_stop) { @@ -286,14 +287,14 @@ void CParticleGroup::SItem::Stop(BOOL def_stop) // GlobalEnv.Render->model_Delete(*it); IRenderVisual* pVisual = smart_cast(*it); GlobalEnv.Render->model_Delete(pVisual); - *it = 0; + *it = nullptr; } for (it = _children_free.begin(); it != _children_free.end(); it++) { // GlobalEnv.Render->model_Delete(*it); IRenderVisual* pVisual = smart_cast(*it); GlobalEnv.Render->model_Delete(pVisual); - *it = 0; + *it = nullptr; } _children_related.clear(); _children_free.clear(); @@ -304,13 +305,16 @@ BOOL CParticleGroup::SItem::IsPlaying() CParticleEffect* E = static_cast(_effect); return E ? E->IsPlaying() : FALSE; } + void CParticleGroup::SItem::UpdateParent(const Fmatrix& m, const Fvector& velocity, BOOL bXFORM) { CParticleEffect* E = static_cast(_effect); if (E) E->UpdateParent(m, velocity, bXFORM); } + //------------------------------------------------------------------------------ + void OnGroupParticleBirth(void* owner, u32 param, PAPI::Particle& m, u32 idx) { CParticleGroup* PG = static_cast(owner); @@ -344,7 +348,7 @@ void OnGroupParticleDead(void* owner, u32 param, PAPI::Particle& m, u32 idx) //------------------------------------------------------------------------------ struct zero_vis_pred : public std::unary_function { - bool operator()(const dxRender_Visual* x) { return x == 0; } + bool operator()(const dxRender_Visual* x) { return x == nullptr; } }; void CParticleGroup::SItem::OnFrame(u32 u_dt, const CPGDef::SEffect& def, Fbox& box, bool& bPlaying) { @@ -426,7 +430,7 @@ void CParticleGroup::SItem::OnFrame(u32 u_dt, const CPGDef::SEffect& def, Fbox& // GlobalEnv.Render->model_Delete(*it); IRenderVisual* pVisual = smart_cast(*it); GlobalEnv.Render->model_Delete(pVisual); - *it = 0; + *it = nullptr; } } } diff --git a/src/Layers/xrRender/ParticleGroup.h b/src/Layers/xrRender/ParticleGroup.h index da606a6fcc1..d7a35c1d3be 100644 --- a/src/Layers/xrRender/ParticleGroup.h +++ b/src/Layers/xrRender/ParticleGroup.h @@ -85,11 +85,10 @@ class ECORE_API CParticleGroup : public dxParticleCustom VisualVec _children_related; VisualVec _children_free; - public: void Set(dxRender_Visual* e); void Clear(); - IC u32 GetVisuals(xr_vector& visuals) + u32 GetVisuals(xr_vector& visuals) { visuals.reserve(_children_related.size() + _children_free.size() + 1); if (_effect) diff --git a/src/Layers/xrRender/R_Backend.cpp b/src/Layers/xrRender/R_Backend.cpp index 2770be2851f..bc3ee459dee 100644 --- a/src/Layers/xrRender/R_Backend.cpp +++ b/src/Layers/xrRender/R_Backend.cpp @@ -66,7 +66,7 @@ void CBackend::CreateQuadIB() void CBackend::RestoreQuadIBData() { const u32 dwTriCount = 4 * 1024; - u16* Indices = 0; + u16* Indices = nullptr; R_CHK(QuadIB->Lock(0, 0, (void**)&Indices, 0)); { int Cnt = 0; @@ -91,7 +91,7 @@ void CBackend::CreateQuadIB() { const u32 dwTriCount = 4 * 1024; const u32 dwIdxCount = dwTriCount * 2 * 3; - u16* Indices = 0; + u16* Indices = nullptr; u32 dwUsage = D3DUSAGE_WRITEONLY; if (HW.Caps.geometry.bSoftware) dwUsage |= D3DUSAGE_SOFTWAREPROCESSING; diff --git a/src/Layers/xrRender/R_Backend.h b/src/Layers/xrRender/R_Backend.h index ce2b0d5da78..f5630c4b078 100644 --- a/src/Layers/xrRender/R_Backend.h +++ b/src/Layers/xrRender/R_Backend.h @@ -217,7 +217,7 @@ class ECORE_API CBackend } stat; public: - IC CTexture* get_ActiveTexture(u32 stage) + CTexture* get_ActiveTexture(u32 stage) { if (stage < CTexture::rstVertex) return textures_ps[stage]; @@ -242,15 +242,15 @@ class ECORE_API CBackend } #else // USE_DX10 VERIFY(!"Invalid texture stage"); - return 0; + return nullptr; #endif // USE_DX10 } #if defined(USE_DX10) || defined(USE_DX11) IC void get_ConstantDirect(shared_str& n, u32 DataSize, void** pVData, void** pGData, void** pPData); #else // USE_DX10 - IC R_constant_array& get_ConstantCache_Vertex() { return constants.a_vertex; } - IC R_constant_array& get_ConstantCache_Pixel() { return constants.a_pixel; } + R_constant_array& get_ConstantCache_Vertex() { return constants.a_vertex; } + R_constant_array& get_ConstantCache_Pixel() { return constants.a_pixel; } #endif // USE_DX10 // API @@ -268,18 +268,18 @@ class ECORE_API CBackend IC ID3DDepthStencilView* get_ZB(); IC void set_Constants(R_constant_table* C); - IC void set_Constants(ref_ctable& C) { set_Constants(&*C); } + void set_Constants(ref_ctable& C) { set_Constants(&*C); } void set_Textures(STextureList* T); - IC void set_Textures(ref_texture_list& T) { set_Textures(&*T); } + void set_Textures(ref_texture_list& T) { set_Textures(&*T); } #ifdef _EDITOR IC void set_Matrices(SMatrixList* M); IC void set_Matrices(ref_matrix_list& M) { set_Matrices(&*M); } #endif IC void set_Element(ShaderElement* S, u32 pass = 0); - IC void set_Element(ref_selement& S, u32 pass = 0) { set_Element(&*S, pass); } + void set_Element(ref_selement& S, u32 pass = 0) { set_Element(&*S, pass); } IC void set_Shader(Shader* S, u32 pass = 0); - IC void set_Shader(ref_shader& S, u32 pass = 0) { set_Shader(&*S, pass); } + void set_Shader(ref_shader& S, u32 pass = 0) { set_Shader(&*S, pass); } ICF void set_States(ID3DState* _state); ICF void set_States(ref_state& _state) { set_States(_state->state); } #if defined(USE_DX10) || defined(USE_DX11) @@ -288,7 +288,7 @@ class ECORE_API CBackend ICF void set_Format(IDirect3DVertexDeclaration9* _decl); #endif // USE_DX10 - ICF void set_PS(ID3DPixelShader* _ps, LPCSTR _n = 0); + ICF void set_PS(ID3DPixelShader* _ps, LPCSTR _n = nullptr); ICF void set_PS(ref_ps& _ps) { set_PS(_ps->ps, _ps->cName.c_str()); } #if defined(USE_DX10) || defined(USE_DX11) ICF void set_GS(ID3DGeometryShader* _gs, LPCSTR _n = 0); @@ -316,7 +316,7 @@ class ECORE_API CBackend protected: // In DX10 we need input shader signature which is stored in ref_vs #endif // USE_DX10 - ICF void set_VS(ID3DVertexShader* _vs, LPCSTR _n = 0); + ICF void set_VS(ID3DVertexShader* _vs, LPCSTR _n = nullptr); #if defined(USE_DX10) || defined(USE_DX11) public: #endif // USE_DX10 @@ -334,10 +334,10 @@ class ECORE_API CBackend IC void set_ColorWriteEnable(u32 _mask = D3DCOLORWRITEENABLE_RED | D3DCOLORWRITEENABLE_GREEN | D3DCOLORWRITEENABLE_BLUE | D3DCOLORWRITEENABLE_ALPHA); IC void set_CullMode(u32 _mode); - IC u32 get_CullMode() { return cull_mode; } - void set_ClipPlanes(u32 _enable, Fplane* _planes = NULL, u32 count = 0); - void set_ClipPlanes(u32 _enable, Fmatrix* _xform = NULL, u32 fmask = 0xff); - IC void set_Scissor(Irect* rect = NULL); + u32 get_CullMode() { return cull_mode; } + void set_ClipPlanes(u32 _enable, Fplane* _planes = nullptr, u32 count = 0); + void set_ClipPlanes(u32 _enable, Fmatrix* _xform = nullptr, u32 fmask = 0xff); + IC void set_Scissor(Irect* rect = nullptr); // constants ICF ref_constant get_c(LPCSTR n) @@ -345,14 +345,14 @@ class ECORE_API CBackend if (ctable) return ctable->get(n); else - return 0; + return nullptr; } ICF ref_constant get_c(shared_str& n) { if (ctable) return ctable->get(n); else - return 0; + return nullptr; } // constants - direct (fast) @@ -510,8 +510,9 @@ class ECORE_API CBackend IC void dbg_SetRS(D3DRENDERSTATETYPE p1, u32 p2) { VERIFY(!"Not implemented"); } IC void dbg_SetSS(u32 sampler, D3DSAMPLERSTATETYPE type, u32 value) { VERIFY(!"Not implemented"); } #else // USE_DX10 - IC void dbg_SetRS(D3DRENDERSTATETYPE p1, u32 p2) { CHK_DX(HW.pDevice->SetRenderState(p1, p2)); } - IC void dbg_SetSS(u32 sampler, D3DSAMPLERSTATETYPE type, u32 value) + void dbg_SetRS(D3DRENDERSTATETYPE p1, u32 p2) { CHK_DX(HW.pDevice->SetRenderState(p1, p2)); } + + void dbg_SetSS(u32 sampler, D3DSAMPLERSTATETYPE type, u32 value) { CHK_DX(HW.pDevice->SetSamplerState(sampler, type, value)); } @@ -519,7 +520,8 @@ class ECORE_API CBackend #ifdef DEBUG void dbg_Draw(D3DPRIMITIVETYPE T, FVF::L* pVerts, int vcnt, u16* pIdx, int pcnt); void dbg_Draw(D3DPRIMITIVETYPE T, FVF::L* pVerts, int pcnt); - IC void dbg_DrawAABB(Fvector& T, float sx, float sy, float sz, u32 C) + + void dbg_DrawAABB(Fvector& T, float sx, float sy, float sz, u32 C) { Fvector half_dim; half_dim.set(sx, sy, sz); @@ -528,7 +530,7 @@ class ECORE_API CBackend dbg_DrawOBB(TM, half_dim, C); } void dbg_DrawOBB(Fmatrix& T, Fvector& half_dim, u32 C); - IC void dbg_DrawTRI(Fmatrix& T, Fvector* p, u32 C) { dbg_DrawTRI(T, p[0], p[1], p[2], C); } + void dbg_DrawTRI(Fmatrix& T, Fvector* p, u32 C) { dbg_DrawTRI(T, p[0], p[1], p[2], C); } void dbg_DrawTRI(Fmatrix& T, Fvector& p1, Fvector& p2, Fvector& p3, u32 C); void dbg_DrawLINE(Fmatrix& T, Fvector& p1, Fvector& p2, u32 C); void dbg_DrawEllipse(Fmatrix& T, u32 C); diff --git a/src/Layers/xrRender/R_Backend_Runtime.cpp b/src/Layers/xrRender/R_Backend_Runtime.cpp index 0c8ed887c44..c54413150f8 100644 --- a/src/Layers/xrRender/R_Backend_Runtime.cpp +++ b/src/Layers/xrRender/R_Backend_Runtime.cpp @@ -26,11 +26,11 @@ void CBackend::OnFrameEnd() #else // USE_DX10 for (u32 stage = 0; stage < HW.Caps.raster.dwStages; stage++) - CHK_DX(HW.pDevice->SetTexture(0, 0)); - CHK_DX(HW.pDevice->SetStreamSource(0, 0, 0, 0)); - CHK_DX(HW.pDevice->SetIndices(0)); - CHK_DX(HW.pDevice->SetVertexShader(0)); - CHK_DX(HW.pDevice->SetPixelShader(0)); + CHK_DX(HW.pDevice->SetTexture(0, nullptr)); + CHK_DX(HW.pDevice->SetStreamSource(0, nullptr, 0, 0)); + CHK_DX(HW.pDevice->SetIndices(nullptr)); + CHK_DX(HW.pDevice->SetVertexShader(nullptr)); + CHK_DX(HW.pDevice->SetPixelShader(nullptr)); Invalidate(); #endif // USE_DX10 } @@ -62,31 +62,31 @@ void CBackend::OnFrameBegin() void CBackend::Invalidate() { - pRT[0] = NULL; - pRT[1] = NULL; - pRT[2] = NULL; - pRT[3] = NULL; - pZB = NULL; - - decl = NULL; - vb = NULL; - ib = NULL; + pRT[0] = nullptr; + pRT[1] = nullptr; + pRT[2] = nullptr; + pRT[3] = nullptr; + pZB = nullptr; + + decl = nullptr; + vb = nullptr; + ib = nullptr; vb_stride = 0; - state = NULL; - ps = NULL; - vs = NULL; + state = nullptr; + ps = nullptr; + vs = nullptr; DX10_ONLY(gs = NULL); #ifdef USE_DX11 hs = 0; ds = 0; cs = 0; #endif - ctable = NULL; + ctable = nullptr; - T = NULL; - M = NULL; - C = NULL; + T = nullptr; + M = nullptr; + C = nullptr; stencil_enable = u32(-1); stencil_func = u32(-1); @@ -142,9 +142,9 @@ void CBackend::Invalidate() #endif // USE_DX10 for (u32 ps_it = 0; ps_it < mtMaxPixelShaderTextures;) - textures_ps[ps_it++] = 0; + textures_ps[ps_it++] = nullptr; for (u32 vs_it = 0; vs_it < mtMaxVertexShaderTextures;) - textures_vs[vs_it++] = 0; + textures_vs[vs_it++] = nullptr; #ifdef _EDITOR for (u32 m_it = 0; m_it < 8;) matrices[m_it++] = 0; @@ -173,7 +173,7 @@ void CBackend::set_ClipPlanes(u32 _enable, Fplane* _planes /*=NULL */, u32 count count = HW.Caps.geometry.dwClipPlanes; D3DXMATRIX worldToClipMatrixIT; - D3DXMatrixInverse(&worldToClipMatrixIT, NULL, (D3DXMATRIX*)&RDEVICE.mFullTransform); + D3DXMatrixInverse(&worldToClipMatrixIT, nullptr, (D3DXMATRIX*)&RDEVICE.mFullTransform); D3DXMatrixTranspose(&worldToClipMatrixIT, &worldToClipMatrixIT); for (u32 it = 0; it < count; it++) { @@ -390,7 +390,7 @@ void CBackend::set_Textures(STextureList* _T) if (!textures_ps[_last_ps]) continue; - textures_ps[_last_ps] = 0; + textures_ps[_last_ps] = nullptr; #if defined(USE_DX10) || defined(USE_DX11) // TODO: DX10: Optimise: set all resources at once ID3DShaderResourceView* pRes = 0; @@ -406,7 +406,7 @@ void CBackend::set_Textures(STextureList* _T) if (!textures_vs[_last_vs]) continue; - textures_vs[_last_vs] = 0; + textures_vs[_last_vs] = nullptr; #if defined(USE_DX10) || defined(USE_DX11) // TODO: DX10: Optimise: set all resources at once ID3DShaderResourceView* pRes = 0; diff --git a/src/Layers/xrRender/R_Backend_hemi.cpp b/src/Layers/xrRender/R_Backend_hemi.cpp index b918e8941b3..27a789911e0 100644 --- a/src/Layers/xrRender/R_Backend_hemi.cpp +++ b/src/Layers/xrRender/R_Backend_hemi.cpp @@ -6,9 +6,9 @@ R_hemi::R_hemi() { unmap(); } void R_hemi::unmap() { - c_pos_faces = 0; - c_neg_faces = 0; - c_material = 0; + c_pos_faces = nullptr; + c_neg_faces = nullptr; + c_material = nullptr; } void R_hemi::set_pos_faces(float posx, float posy, float posz) diff --git a/src/Layers/xrRender/R_Backend_tree.cpp b/src/Layers/xrRender/R_Backend_tree.cpp index ba661a1578f..6ac62c25373 100644 --- a/src/Layers/xrRender/R_Backend_tree.cpp +++ b/src/Layers/xrRender/R_Backend_tree.cpp @@ -6,14 +6,14 @@ R_tree::R_tree() { unmap(); } void R_tree::unmap() { - c_m_xform_v = 0; - c_m_xform = 0; - c_consts = 0; - c_wave = 0; - c_wind = 0; - c_c_scale = 0; - c_c_bias = 0; - c_c_sun = 0; + c_m_xform_v = nullptr; + c_m_xform = nullptr; + c_consts = nullptr; + c_wave = nullptr; + c_wind = nullptr; + c_c_scale = nullptr; + c_c_bias = nullptr; + c_c_sun = nullptr; } void R_tree::set_m_xform_v(Fmatrix& mat) diff --git a/src/Layers/xrRender/R_Backend_xform.cpp b/src/Layers/xrRender/R_Backend_xform.cpp index 459bd7f772e..6d8090c123d 100644 --- a/src/Layers/xrRender/R_Backend_xform.cpp +++ b/src/Layers/xrRender/R_Backend_xform.cpp @@ -65,13 +65,13 @@ void R_xforms::apply_invw() void R_xforms::unmap() { - c_w = NULL; - c_invw = NULL; - c_v = NULL; - c_p = NULL; - c_wv = NULL; - c_vp = NULL; - c_wvp = NULL; + c_w = nullptr; + c_invw = nullptr; + c_v = nullptr; + c_p = nullptr; + c_wv = nullptr; + c_vp = nullptr; + c_wvp = nullptr; } R_xforms::R_xforms() { diff --git a/src/Layers/xrRender/R_Backend_xform.h b/src/Layers/xrRender/R_Backend_xform.h index 9ba13ef3e7c..92fae21e68e 100644 --- a/src/Layers/xrRender/R_Backend_xform.h +++ b/src/Layers/xrRender/R_Backend_xform.h @@ -30,9 +30,9 @@ class ECORE_API R_xforms void set_W(const Fmatrix& m); void set_V(const Fmatrix& m); void set_P(const Fmatrix& m); - IC const Fmatrix& get_W() { return m_w; } - IC const Fmatrix& get_V() { return m_v; } - IC const Fmatrix& get_P() { return m_p; } + const Fmatrix& get_W() { return m_w; } + const Fmatrix& get_V() { return m_v; } + const Fmatrix& get_P() { return m_p; } IC void set_c_w(R_constant* C); IC void set_c_invw(R_constant* C); IC void set_c_v(R_constant* C); diff --git a/src/Layers/xrRender/R_DStreams.cpp b/src/Layers/xrRender/R_DStreams.cpp index 35917a89abd..7d4c697f60f 100644 --- a/src/Layers/xrRender/R_DStreams.cpp +++ b/src/Layers/xrRender/R_DStreams.cpp @@ -66,7 +66,7 @@ void* _VertexStream::Lock(u32 vl_Count, u32 Stride, u32& vOffset) u32 vl_mPosition = mPosition / Stride + 1; // Check if there is need to flush and perform lock - BYTE* pData = 0; + BYTE* pData = nullptr; if ((vl_Count + vl_mPosition) >= vl_mSize) { // FLUSH-LOCK @@ -155,7 +155,7 @@ void _VertexStream::reset_end() _VertexStream::_VertexStream() { _clear(); }; void _VertexStream::_clear() { - pVB = NULL; + pVB = nullptr; mSize = 0; mPosition = 0; mDiscardID = 0; @@ -209,7 +209,7 @@ u16* _IndexStream::Lock(u32 Count, u32& vOffset) #endif PGO(Msg("PGO:IB_LOCK:%d", Count)); vOffset = 0; - BYTE* pLockedData = 0; + BYTE* pLockedData = nullptr; // Ensure there is enough space in the VB for this data R_ASSERT((2 * Count <= mSize) && Count); diff --git a/src/Layers/xrRender/R_DStreams.h b/src/Layers/xrRender/R_DStreams.h index 7e979a21c4c..16fcb424060 100644 --- a/src/Layers/xrRender/R_DStreams.h +++ b/src/Layers/xrRender/R_DStreams.h @@ -29,9 +29,9 @@ class ECORE_API _VertexStream void reset_begin(); void reset_end(); - IC ID3DVertexBuffer* Buffer() { return pVB; } - IC u32 DiscardID() { return mDiscardID; } - IC void Flush() { mPosition = mSize; } + ID3DVertexBuffer* Buffer() { return pVB; } + u32 DiscardID() { return mDiscardID; } + void Flush() { mPosition = mSize; } void* Lock(u32 vl_Count, u32 Stride, u32& vOffset); void Unlock(u32 Count, u32 Stride); u32 GetSize() { return mSize; } @@ -53,7 +53,7 @@ class ECORE_API _IndexStream private: void _clear() { - pIB = NULL; + pIB = nullptr; mSize = 0; mPosition = 0; mDiscardID = 0; @@ -65,8 +65,8 @@ class ECORE_API _IndexStream void reset_begin(); void reset_end(); - IC ID3DIndexBuffer* Buffer() { return pIB; } - IC u32 DiscardID() { return mDiscardID; } + ID3DIndexBuffer* Buffer() { return pIB; } + u32 DiscardID() { return mDiscardID; } void Flush() { mPosition = mSize; } u16* Lock(u32 Count, u32& vOffset); void Unlock(u32 RealCount); diff --git a/src/Layers/xrRender/ResourceManager.cpp b/src/Layers/xrRender/ResourceManager.cpp index 782b106998c..5d6aa215381 100644 --- a/src/Layers/xrRender/ResourceManager.cpp +++ b/src/Layers/xrRender/ResourceManager.cpp @@ -66,7 +66,7 @@ IBlender* CResourceManager::_GetBlender(LPCSTR Name) if (I == m_blenders.end()) { xrDebug::Fatal(DEBUG_INFO, "Shader '%s' not found in library.", Name); - return 0; + return nullptr; } #endif else @@ -76,12 +76,12 @@ IBlender* CResourceManager::_GetBlender(LPCSTR Name) IBlender* CResourceManager::_FindBlender(LPCSTR Name) { if (!(Name && Name[0])) - return 0; + return nullptr; LPSTR N = LPSTR(Name); map_Blender::iterator I = m_blenders.find(N); if (I == m_blenders.end()) - return 0; + return nullptr; else return I->second; } @@ -107,7 +107,7 @@ void CResourceManager::ED_UpdateBlender(LPCSTR Name, IBlender* data) ////////////////////////////////////////////////////////////////////// void CResourceManager::_ParseList(sh_list& dest, LPCSTR names) { - if (0 == names || 0 == names[0]) + if (nullptr == names || 0 == names[0]) names = "$null"; ZeroMemory(&dest, sizeof(dest)); @@ -148,7 +148,7 @@ void CResourceManager::_ParseList(sh_list& dest, LPCSTR names) ShaderElement* CResourceManager::_CreateElement(ShaderElement& S) { if (S.passes.empty()) - return 0; + return nullptr; // Search equal in shaders array for (u32 it = 0; it < v_elements.size(); it++) @@ -288,7 +288,7 @@ Shader* CResourceManager::_cpp_Create(LPCSTR s_shader, LPCSTR s_textures, LPCSTR else #endif { - return NULL; + return nullptr; } //#endif } @@ -307,7 +307,7 @@ Shader* CResourceManager::Create(IBlender* B, LPCSTR s_shader, LPCSTR s_textures else #endif { - return NULL; + return nullptr; //#endif } } @@ -353,7 +353,7 @@ Shader* CResourceManager::Create(LPCSTR s_shader, LPCSTR s_textures, LPCSTR s_co else #endif { - return NULL; + return nullptr; } //#endif } diff --git a/src/Layers/xrRender/ResourceManager.h b/src/Layers/xrRender/ResourceManager.h index 00e2998ae94..bd5517576dc 100644 --- a/src/Layers/xrRender/ResourceManager.h +++ b/src/Layers/xrRender/ResourceManager.h @@ -21,7 +21,7 @@ class ECORE_API CResourceManager private: struct str_pred : public std::binary_function { - IC bool operator()(LPCSTR x, LPCSTR y) const { return xr_strcmp(x, y) < 0; } + bool operator()(LPCSTR x, LPCSTR y) const { return xr_strcmp(x, y) < 0; } }; struct texture_detail { @@ -193,9 +193,9 @@ class ECORE_API CResourceManager ShaderElement* _CreateElement(ShaderElement& L); void _DeleteElement(const ShaderElement* L); - Shader* _cpp_Create(LPCSTR s_shader, LPCSTR s_textures = 0, LPCSTR s_constants = 0, LPCSTR s_matrices = 0); + Shader* _cpp_Create(LPCSTR s_shader, LPCSTR s_textures = nullptr, LPCSTR s_constants = nullptr, LPCSTR s_matrices = nullptr); Shader* _cpp_Create( - IBlender* B, LPCSTR s_shader = 0, LPCSTR s_textures = 0, LPCSTR s_constants = 0, LPCSTR s_matrices = 0); + IBlender* B, LPCSTR s_shader = nullptr, LPCSTR s_textures = nullptr, LPCSTR s_constants = nullptr, LPCSTR s_matrices = nullptr); Shader* _lua_Create(LPCSTR s_shader, LPCSTR s_textures); BOOL _lua_HasShader(LPCSTR s_shader); @@ -210,9 +210,9 @@ class ECORE_API CResourceManager void reset_end(); // Creation/Destroying - Shader* Create(LPCSTR s_shader = 0, LPCSTR s_textures = 0, LPCSTR s_constants = 0, LPCSTR s_matrices = 0); + Shader* Create(LPCSTR s_shader = nullptr, LPCSTR s_textures = nullptr, LPCSTR s_constants = nullptr, LPCSTR s_matrices = nullptr); Shader* Create( - IBlender* B, LPCSTR s_shader = 0, LPCSTR s_textures = 0, LPCSTR s_constants = 0, LPCSTR s_matrices = 0); + IBlender* B, LPCSTR s_shader = nullptr, LPCSTR s_textures = nullptr, LPCSTR s_constants = nullptr, LPCSTR s_matrices = nullptr); void Delete(const Shader* S); void RegisterConstantSetup(LPCSTR name, R_constant_setup* s) { diff --git a/src/Layers/xrRender/ResourceManager_Loader.cpp b/src/Layers/xrRender/ResourceManager_Loader.cpp index 70721d711a3..55fe2e925a5 100644 --- a/src/Layers/xrRender/ResourceManager_Loader.cpp +++ b/src/Layers/xrRender/ResourceManager_Loader.cpp @@ -58,7 +58,7 @@ void CResourceManager::OnDeviceCreate(IReader* F) // scripting LS_Load(); #endif - IReader* fs = 0; + IReader* fs = nullptr; // Load constants fs = F->open_chunk(0); if (fs) @@ -89,15 +89,15 @@ void CResourceManager::OnDeviceCreate(IReader* F) fs = F->open_chunk(2); if (fs) { - IReader* chunk = NULL; + IReader* chunk = nullptr; int chunk_id = 0; - while ((chunk = fs->open_chunk(chunk_id)) != NULL) + while ((chunk = fs->open_chunk(chunk_id)) != nullptr) { CBlender_DESC desc; chunk->r(&desc, sizeof(desc)); IBlender* B = IBlender::Create(desc.CLS); - if (0 == B) + if (nullptr == B) { Msg("! Renderer doesn't support blender '%s'", desc.cName); } diff --git a/src/Layers/xrRender/ResourceManager_Resources.cpp b/src/Layers/xrRender/ResourceManager_Resources.cpp index 99c463eee7c..dbb7ddd0721 100644 --- a/src/Layers/xrRender/ResourceManager_Resources.cpp +++ b/src/Layers/xrRender/ResourceManager_Resources.cpp @@ -182,7 +182,7 @@ SVS* CResourceManager::_CreateVS(LPCSTR _name) m_vs.insert(std::make_pair(_vs->set_name(name), _vs)); if (0 == _stricmp(_name, "null")) { - _vs->vs = NULL; + _vs->vs = nullptr; return _vs; } @@ -268,7 +268,7 @@ SPS* CResourceManager::_CreatePS(LPCSTR name) m_ps.insert(std::make_pair(_ps->set_name(name), _ps)); if (0 == _stricmp(name, "null")) { - _ps->ps = NULL; + _ps->ps = nullptr; return _ps; } @@ -350,7 +350,7 @@ void CResourceManager::_DeletePS(const SPS* ps) R_constant_table* CResourceManager::_CreateConstantTable(R_constant_table& C) { if (C.empty()) - return NULL; + return nullptr; for (u32 it = 0; it < v_constant_tables.size(); it++) if (v_constant_tables[it]->equal(C)) return v_constant_tables[it]; @@ -497,7 +497,7 @@ CTexture* CResourceManager::_CreateTexture(LPCSTR _Name) { // DBG_VerifyTextures (); if (0 == xr_strcmp(_Name, "null")) - return 0; + return nullptr; R_ASSERT(_Name && _Name[0]); string_path Name; xr_strcpy(Name, _Name); //. andy if (strext(Name)) *strext(Name)=0; @@ -559,7 +559,7 @@ CMatrix* CResourceManager::_CreateMatrix(LPCSTR Name) { R_ASSERT(Name && Name[0]); if (0 == _stricmp(Name, "$null")) - return NULL; + return nullptr; LPSTR N = LPSTR(Name); map_Matrix::iterator I = m_matrices.find(N); @@ -597,7 +597,7 @@ CConstant* CResourceManager::_CreateConstant(LPCSTR Name) { R_ASSERT(Name && Name[0]); if (0 == _stricmp(Name, "$null")) - return NULL; + return nullptr; LPSTR N = LPSTR(Name); map_Constant::iterator I = m_constants.find(N); @@ -670,7 +670,7 @@ SMatrixList* CResourceManager::_CreateMatrixList(SMatrixList& L) break; } if (bEmpty) - return NULL; + return nullptr; for (u32 it = 0; it < lst_matrices.size(); it++) { @@ -702,7 +702,7 @@ SConstantList* CResourceManager::_CreateConstantList(SConstantList& L) break; } if (bEmpty) - return NULL; + return nullptr; for (u32 it = 0; it < lst_constants.size(); it++) { diff --git a/src/Layers/xrRender/ResourceManager_Scripting.cpp b/src/Layers/xrRender/ResourceManager_Scripting.cpp index 1b09a8a370f..b4ab6fa9778 100644 --- a/src/Layers/xrRender/ResourceManager_Scripting.cpp +++ b/src/Layers/xrRender/ResourceManager_Scripting.cpp @@ -28,12 +28,12 @@ class adopt_sampler adopt_sampler(CBlender_Compile* _C, u32 _stage) : C(_C), stage(_stage) { if (u32(-1) == stage) - C = 0; + C = nullptr; } adopt_sampler(const adopt_sampler& _C) : C(_C.C), stage(_C.stage) { if (u32(-1) == stage) - C = 0; + C = nullptr; } adopt_sampler& _texture(LPCSTR texture) @@ -218,7 +218,7 @@ class adopt_compiler } adopt_sampler _sampler(LPCSTR _name) { - u32 s = C->r_Sampler(_name, 0); + u32 s = C->r_Sampler(_name, nullptr); return adopt_sampler(C, s); } }; @@ -290,7 +290,7 @@ void CResourceManager::LS_Load() { string_path namesp, fn; xr_strcpy(namesp, (*folder)[it]); - if (0 == strext(namesp) || 0 != xr_strcmp(strext(namesp), ".s")) + if (nullptr == strext(namesp) || 0 != xr_strcmp(strext(namesp), ".s")) continue; *strext(namesp) = 0; if (0 == namesp[0]) @@ -329,14 +329,14 @@ Shader* CResourceManager::_lua_Create(LPCSTR d_shader, LPCSTR s_textures) LPCSTR s_shader = undercorated; // Access to template - C.BT = NULL; + C.BT = nullptr; C.bEditor = FALSE; C.bDetail = FALSE; // Prepare _ParseList(C.L_textures, s_textures); - C.detail_texture = NULL; - C.detail_scaler = NULL; + C.detail_texture = nullptr; + C.detail_scaler = nullptr; // Compile element (LOD0 - HQ) if (ScriptEngine.object(s_shader, "normal_hq", LUA_TFUNCTION)) diff --git a/src/Layers/xrRender/SH_Atomic.cpp b/src/Layers/xrRender/SH_Atomic.cpp index 343a9624ebe..7dd4ef37406 100644 --- a/src/Layers/xrRender/SH_Atomic.cpp +++ b/src/Layers/xrRender/SH_Atomic.cpp @@ -28,7 +28,7 @@ /////////////////////////////////////////////////////////////////////// // SVS -SVS::SVS() : vs(0) +SVS::SVS() : vs(nullptr) #if defined(USE_DX10) || defined(USE_DX11) // ,signature(0) #endif // USE_DX10 diff --git a/src/Layers/xrRender/SH_Constant.h b/src/Layers/xrRender/SH_Constant.h index da6d4c32614..f93bbe25021 100644 --- a/src/Layers/xrRender/SH_Constant.h +++ b/src/Layers/xrRender/SH_Constant.h @@ -28,23 +28,27 @@ class ECORE_API CConstant : public xr_resource_named WaveForm _A; CConstant() { memset(this, 0, sizeof(CConstant)); } - IC void set_float(float r, float g, float b, float a) + + void set_float(float r, float g, float b, float a) { const_float.set(r, g, b, a); const_dword = const_float.get(); } - IC void set_float(Fcolor& c) + + void set_float(Fcolor& c) { const_float.set(c); const_dword = const_float.get(); } - IC void set_dword(u32 c) + + void set_dword(u32 c) { const_float.set(c); const_dword = c; } void Calculate(); - IC BOOL Similar(CConstant& C) // comare by modes and params + + BOOL Similar(CConstant& C) // comare by modes and params { if (dwMode != C.dwMode) return FALSE; diff --git a/src/Layers/xrRender/SH_Matrix.h b/src/Layers/xrRender/SH_Matrix.h index 367474bc0f1..0537beac85f 100644 --- a/src/Layers/xrRender/SH_Matrix.h +++ b/src/Layers/xrRender/SH_Matrix.h @@ -41,7 +41,8 @@ class ECORE_API CMatrix : public xr_resource_named WaveForm scrollU, scrollV; CMatrix() { memset(this, 0, sizeof(CMatrix)); } - IC void tc_trans(Fmatrix& T, float u, float v) + + void tc_trans(Fmatrix& T, float u, float v) { T.identity(); T.m[2][0] = u; @@ -49,7 +50,7 @@ class ECORE_API CMatrix : public xr_resource_named } void Calculate(); - IC BOOL Similar(CMatrix& M) // comare by modes and params + BOOL Similar(CMatrix& M) // comare by modes and params { if (dwMode != M.dwMode) return FALSE; diff --git a/src/Layers/xrRender/SH_RT.h b/src/Layers/xrRender/SH_RT.h index 9f238cee7ca..132d213f5a2 100644 --- a/src/Layers/xrRender/SH_RT.h +++ b/src/Layers/xrRender/SH_RT.h @@ -16,7 +16,7 @@ class CRT : public xr_resource_named void destroy(); void reset_begin(); void reset_end(); - IC BOOL valid() { return !!pTexture; } + BOOL valid() { return !!pTexture; } public: ID3DTexture2D* pSurface; ID3DRenderTargetView* pRT; @@ -43,7 +43,7 @@ struct resptrcode_crt : public resptr_base #else void create(LPCSTR Name, u32 w, u32 h, D3DFORMAT f, u32 SampleCount = 1); #endif - void destroy() { _set(NULL); } + void destroy() { _set(nullptr); } }; typedef resptr_core ref_rt; diff --git a/src/Layers/xrRender/SH_Texture.cpp b/src/Layers/xrRender/SH_Texture.cpp index b1bd6e62d2f..d489186c263 100644 --- a/src/Layers/xrRender/SH_Texture.cpp +++ b/src/Layers/xrRender/SH_Texture.cpp @@ -20,10 +20,10 @@ void resptrcode_texture::create(LPCSTR _name) { _set(RImplementation.Resources-> ////////////////////////////////////////////////////////////////////// CTexture::CTexture() { - pSurface = NULL; - pAVI = NULL; - pTheora = NULL; - desc_cache = 0; + pSurface = nullptr; + pAVI = nullptr; + pTheora = nullptr; + desc_cache = nullptr; seqMSPF = 0; flags.MemoryUsage = 0; flags.bLoaded = false; @@ -152,7 +152,7 @@ void CTexture::Preload() void CTexture::Load() { flags.bLoaded = true; - desc_cache = 0; + desc_cache = nullptr; if (pSurface) return; @@ -160,7 +160,7 @@ void CTexture::Load() flags.MemoryUsage = 0; if (0 == _stricmp(*cName, "$null")) return; - if (0 != strstr(*cName, "$user$")) + if (nullptr != strstr(*cName, "$user$")) { flags.bUser = true; return; @@ -188,16 +188,16 @@ void CTexture::Load() else { flags.MemoryUsage = pTheora->Width(true) * pTheora->Height(true) * 4; - BOOL bstop_at_end = (0 != strstr(cName.c_str(), "intro\\")) || (0 != strstr(cName.c_str(), "outro\\")); + BOOL bstop_at_end = (nullptr != strstr(cName.c_str(), "intro\\")) || (nullptr != strstr(cName.c_str(), "outro\\")); pTheora->Play(!bstop_at_end, RDEVICE.dwTimeContinual); // Now create texture - ID3DTexture2D* pTexture = 0; + ID3DTexture2D* pTexture = nullptr; u32 _w = pTheora->Width(false); u32 _h = pTheora->Height(false); HRESULT hrr = - HW.pDevice->CreateTexture(_w, _h, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &pTexture, NULL); + HW.pDevice->CreateTexture(_w, _h, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &pTexture, nullptr); pSurface = pTexture; if (FAILED(hrr)) @@ -205,7 +205,7 @@ void CTexture::Load() FATAL("Invalid video stream"); R_CHK(hrr); xr_delete(pTheora); - pSurface = 0; + pSurface = nullptr; } } } @@ -224,16 +224,16 @@ void CTexture::Load() flags.MemoryUsage = pAVI->m_dwWidth * pAVI->m_dwHeight * 4; // Now create texture - ID3DTexture2D* pTexture = 0; + ID3DTexture2D* pTexture = nullptr; HRESULT hrr = HW.pDevice->CreateTexture( - pAVI->m_dwWidth, pAVI->m_dwHeight, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &pTexture, NULL); + pAVI->m_dwWidth, pAVI->m_dwHeight, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &pTexture, nullptr); pSurface = pTexture; if (FAILED(hrr)) { FATAL("Invalid video stream"); R_CHK(hrr); xr_delete(pAVI); - pSurface = 0; + pSurface = nullptr; } } } @@ -270,7 +270,7 @@ void CTexture::Load() } } } - pSurface = 0; + pSurface = nullptr; FS.r_close(_fs); } else @@ -308,7 +308,7 @@ void CTexture::Unload() _RELEASE(seqDATA[I]); } seqDATA.clear(); - pSurface = 0; + pSurface = nullptr; } flags.MemoryUsage = 0; diff --git a/src/Layers/xrRender/SH_Texture.h b/src/Layers/xrRender/SH_Texture.h index 9ae376cee0a..e07f123fdaf 100644 --- a/src/Layers/xrRender/SH_Texture.h +++ b/src/Layers/xrRender/SH_Texture.h @@ -39,13 +39,15 @@ class ECORE_API CTexture : public xr_resource_named void surface_set(ID3DBaseTexture* surf); ID3DBaseTexture* surface_get(); - IC BOOL isUser() { return flags.bUser; } - IC u32 get_Width() + BOOL isUser() { return flags.bUser; } + + u32 get_Width() { desc_enshure(); return desc.Width; } - IC u32 get_Height() + + u32 get_Height() { desc_enshure(); return desc.Height; @@ -65,8 +67,9 @@ class ECORE_API CTexture : public xr_resource_named #endif // USE_DX10 private: - IC BOOL desc_valid() { return pSurface == desc_cache; } - IC void desc_enshure() + BOOL desc_valid() { return pSurface == desc_cache; } + + void desc_enshure() { if (!desc_valid()) desc_update(); @@ -121,7 +124,7 @@ class ECORE_API CTexture : public xr_resource_named struct resptrcode_texture : public resptr_base { void create(LPCSTR _name); - void destroy() { _set(NULL); } + void destroy() { _set(nullptr); } shared_str bump_get() { return _get()->m_bumpmap; } bool bump_exist() { return 0 != bump_get().size(); } }; diff --git a/src/Layers/xrRender/Shader.cpp b/src/Layers/xrRender/Shader.cpp index dab6724d3db..5f40ead3e2e 100644 --- a/src/Layers/xrRender/Shader.cpp +++ b/src/Layers/xrRender/Shader.cpp @@ -104,9 +104,9 @@ BOOL ShaderElement::equal(ShaderElement& S) BOOL ShaderElement::equal(ShaderElement* S) { - if (0 == S && 0 == this) + if (nullptr == S && nullptr == this) return TRUE; - if (0 == S || 0 == this) + if (nullptr == S || nullptr == this) return FALSE; return equal(*S); } diff --git a/src/Layers/xrRender/Shader.h b/src/Layers/xrRender/Shader.h index 6e5d2701d57..22d46a7ab39 100644 --- a/src/Layers/xrRender/Shader.h +++ b/src/Layers/xrRender/Shader.h @@ -28,7 +28,7 @@ struct ECORE_API STextureList : public xr_resource_flagged, public xr_vector> inherited_vec; ~STextureList(); - IC BOOL equal(const STextureList& base) const + BOOL equal(const STextureList& base) const { if (size() != base.size()) return FALSE; @@ -76,7 +76,7 @@ struct ECORE_API resptrcode_geom : public resptr_base { void create(D3DVERTEXELEMENT9* decl, ID3DVertexBuffer* vb, ID3DIndexBuffer* ib); void create(u32 FVF, ID3DVertexBuffer* vb, ID3DIndexBuffer* ib); - void destroy() { _set(NULL); } + void destroy() { _set(nullptr); } u32 stride() const { return _get()->vb_stride; } }; @@ -147,9 +147,9 @@ struct ECORE_API Shader : public xr_resource_flagged }; struct ECORE_API resptrcode_shader : public resptr_base { - void create(LPCSTR s_shader = 0, LPCSTR s_textures = 0, LPCSTR s_constants = 0, LPCSTR s_matrices = 0); - void create(IBlender* B, LPCSTR s_shader = 0, LPCSTR s_textures = 0, LPCSTR s_constants = 0, LPCSTR s_matrices = 0); - void destroy() { _set(NULL); } + void create(LPCSTR s_shader = nullptr, LPCSTR s_textures = nullptr, LPCSTR s_constants = nullptr, LPCSTR s_matrices = nullptr); + void create(IBlender* B, LPCSTR s_shader = nullptr, LPCSTR s_textures = nullptr, LPCSTR s_constants = nullptr, LPCSTR s_matrices = nullptr); + void destroy() { _set(nullptr); } }; typedef resptr_core ref_shader; diff --git a/src/Layers/xrRender/SkeletonAnimated.cpp b/src/Layers/xrRender/SkeletonAnimated.cpp index 0477d9c3943..a8a0cc7ad1c 100644 --- a/src/Layers/xrRender/SkeletonAnimated.cpp +++ b/src/Layers/xrRender/SkeletonAnimated.cpp @@ -68,7 +68,7 @@ std::pair CKinematicsAnimated::LL_MotionDefName_dbg(MotionID ID) for (_I = s_mots.motion_map()->begin(); _I != _E; ++_I) if (_I->second == ID.idx) return std::make_pair(*_I->first, *s_mots.id()); - return std::make_pair((LPCSTR)0, (LPCSTR)0); + return std::make_pair((LPCSTR)nullptr, (LPCSTR)nullptr); } static LPCSTR name_bool(BOOL v) @@ -121,7 +121,7 @@ u32 CKinematicsAnimated::LL_PartBlendsCount(u32 bone_part_id) { return blend_cyc CBlend* CKinematicsAnimated::LL_PartBlend(u32 bone_part_id, u32 n) { if (LL_PartBlendsCount(bone_part_id) <= n) - return 0; + return nullptr; return blend_cycle(bone_part_id)[n]; } void CKinematicsAnimated::LL_IterateBlends(IterateBlendsCallback& callback) @@ -168,12 +168,12 @@ MotionID CKinematicsAnimated::LL_MotionID(LPCSTR B) } u16 CKinematicsAnimated::LL_PartID(LPCSTR B) { - if (0 == m_Partition) + if (nullptr == m_Partition) return BI_NONE; for (u16 id = 0; id < MAX_PARTS; id++) { CPartDef& P = (*m_Partition)[id]; - if (0 == P.Name) + if (nullptr == P.Name) continue; if (0 == _stricmp(B, *P.Name)) return id; @@ -342,8 +342,8 @@ void CKinematicsAnimated::IFXBlendSetup( B.stop_at_end_callback = TRUE; B.stop_at_end = FALSE; // - B.Callback = 0; - B.CallbackParam = 0; + B.Callback = nullptr; + B.CallbackParam = nullptr; B.channel = 0; B.fall_at_end = FALSE; @@ -353,18 +353,18 @@ CBlend* CKinematicsAnimated::LL_PlayCycle(u16 part, MotionID motion_ID, BOOL bMi { // validate and unroll if (!motion_ID.valid()) - return 0; + return nullptr; if (BI_NONE == part) { for (u16 i = 0; i < MAX_PARTS; i++) LL_PlayCycle( i, motion_ID, bMixing, blendAccrue, blendFalloff, Speed, noloop, Callback, CallbackParam, channel); - return 0; + return nullptr; } if (part >= MAX_PARTS) - return 0; - if (0 == m_Partition->part(part).Name) - return 0; + return nullptr; + if (nullptr == m_Partition->part(part).Name) + return nullptr; // shared_motions* s_mots = &m_Motions[motion.slot]; // CMotionDef* m_def = s_mots->motion_def(motion.idx); @@ -407,7 +407,7 @@ CBlend* CKinematicsAnimated::PlayCycle( else { xrDebug::Fatal(DEBUG_INFO, "! MODEL: can't find cycle: %s", N); - return 0; + return nullptr; } } CBlend* CKinematicsAnimated::PlayCycle( @@ -472,9 +472,9 @@ CBlend* CKinematicsAnimated::LL_PlayFX( u16 bone, MotionID motion_ID, float blendAccrue, float blendFalloff, float Speed, float Power) { if (!motion_ID.valid()) - return 0; + return nullptr; if (blend_fx.size() >= MAX_BLENDED) - return 0; + return nullptr; if (BI_NONE == bone) bone = iRoot; @@ -506,7 +506,7 @@ void CKinematicsAnimated::LL_UpdateTracks(float dt, bool b_force, bool leave_ble // Cycles for (u16 part = 0; part < MAX_PARTS; part++) { - if (0 == m_Partition->part(part).Name) + if (nullptr == m_Partition->part(part).Name) continue; I = blend_cycles[part].begin(); E = blend_cycles[part].end(); @@ -625,8 +625,8 @@ void CKinematicsAnimated::Release() CKinematicsAnimated::~CKinematicsAnimated() { IBoneInstances_Destroy(); } CKinematicsAnimated::CKinematicsAnimated() - : CKinematics(), IKinematicsAnimated(), blend_instances(NULL), m_Partition(NULL), m_blend_destroy_callback(0), - m_update_tracks_callback(0), Update_LastTime(0) + : CKinematics(), IKinematicsAnimated(), blend_instances(nullptr), m_Partition(nullptr), m_blend_destroy_callback(nullptr), + m_update_tracks_callback(nullptr), Update_LastTime(0) { } @@ -645,7 +645,7 @@ void CKinematicsAnimated::IBoneInstances_Destroy() if (blend_instances) { xr_free(blend_instances); - blend_instances = NULL; + blend_instances = nullptr; } } @@ -669,7 +669,7 @@ void CKinematicsAnimated::Spawn() for (u32 i = 0; i < bones->size(); i++) blend_instances[i].construct(); - m_update_tracks_callback = 0; + m_update_tracks_callback = nullptr; channels.init(); } void CKinematicsAnimated::ChannelFactorsStartup() { channels.init(); } @@ -711,15 +711,15 @@ CBlend* CKinematicsAnimated::IBlend_Create() if (I->blend_state() == CBlend::eFREE_SLOT) return I; FATAL("Too many blended motions requisted"); - return 0; + return nullptr; } void CKinematicsAnimated::Load(const char* N, IReader* data, u32 dwFlags) { inherited::Load(N, data, dwFlags); // Globals - blend_instances = NULL; - m_Partition = NULL; + blend_instances = nullptr; + m_Partition = nullptr; Update_LastTime = 0; // Load animation @@ -758,7 +758,7 @@ void CKinematicsAnimated::Load(const char* N, IReader* data, u32 dwFlags) FS.r_close(MS); } if (create_res) - m_Motions.back().motions.create(nm, NULL, bones); + m_Motions.back().motions.create(nm, nullptr, bones); else { m_Motions.pop_back(); @@ -798,7 +798,7 @@ void CKinematicsAnimated::Load(const char* N, IReader* data, u32 dwFlags) FS.r_close(MS); } if (create_res) - m_Motions.back().motions.create(nm, NULL, bones); + m_Motions.back().motions.create(nm, nullptr, bones); else { m_Motions.pop_back(); diff --git a/src/Layers/xrRender/SkeletonAnimated.h b/src/Layers/xrRender/SkeletonAnimated.h index fe0cbe78e4c..c4a29e74083 100644 --- a/src/Layers/xrRender/SkeletonAnimated.h +++ b/src/Layers/xrRender/SkeletonAnimated.h @@ -22,7 +22,7 @@ class CBlendInstance // Bone Instance Blend List (per-bone data) public: // methods - IC BlendSVec& blend_vector() { return Blend; } + BlendSVec& blend_vector() { return Blend; } void construct(); void blend_add(CBlend* H); void blend_remove(CBlend* H); @@ -142,9 +142,9 @@ class ECORE_API CKinematicsAnimated : public CKinematics, public IKinematicsAnim #endif u16 LL_MotionsSlotCount() { return (u16)m_Motions.size(); } const shared_motions& LL_MotionsSlot(u16 idx) { return m_Motions[idx].motions; } - IC CMotionDef* LL_GetMotionDef(MotionID id) { return m_Motions[id.slot].motions.motion_def(id.idx); } - IC CMotion* LL_GetRootMotion(MotionID id) { return &m_Motions[id.slot].bone_motions[iRoot]->at(id.idx); } - IC CMotion* LL_GetMotion(MotionID id, u16 bone_id) { return &m_Motions[id.slot].bone_motions[bone_id]->at(id.idx); } + CMotionDef* LL_GetMotionDef(MotionID id) { return m_Motions[id.slot].motions.motion_def(id.idx); } + CMotion* LL_GetRootMotion(MotionID id) { return &m_Motions[id.slot].bone_motions[iRoot]->at(id.idx); } + CMotion* LL_GetMotion(MotionID id, u16 bone_id) { return &m_Motions[id.slot].bone_motions[bone_id]->at(id.idx); } virtual IBlendDestroyCallback* GetBlendDestroyCallback(); virtual void SetBlendDestroyCallback(IBlendDestroyCallback* cb); // Low level interface @@ -177,11 +177,11 @@ class ECORE_API CKinematicsAnimated : public CKinematics, public IKinematicsAnim MotionID ID_Cycle(shared_str N); MotionID ID_Cycle_Safe(shared_str N); CBlend* PlayCycle( - LPCSTR N, BOOL bMixIn = TRUE, PlayCallback Callback = 0, LPVOID CallbackParam = 0, u8 channel = 0); + LPCSTR N, BOOL bMixIn = TRUE, PlayCallback Callback = nullptr, LPVOID CallbackParam = nullptr, u8 channel = 0); CBlend* PlayCycle( - MotionID M, BOOL bMixIn = TRUE, PlayCallback Callback = 0, LPVOID CallbackParam = 0, u8 channel = 0); - CBlend* PlayCycle(u16 partition, MotionID M, BOOL bMixIn = TRUE, PlayCallback Callback = 0, - LPVOID CallbackParam = 0, u8 channel = 0); + MotionID M, BOOL bMixIn = TRUE, PlayCallback Callback = nullptr, LPVOID CallbackParam = nullptr, u8 channel = 0); + CBlend* PlayCycle(u16 partition, MotionID M, BOOL bMixIn = TRUE, PlayCallback Callback = nullptr, + LPVOID CallbackParam = nullptr, u8 channel = 0); // fx'es MotionID ID_FX(LPCSTR N); MotionID ID_FX_Safe(LPCSTR N); @@ -207,7 +207,7 @@ class ECORE_API CKinematicsAnimated : public CKinematics, public IKinematicsAnim return sz; } - IC const BlendSVec& blend_cycle(const u32& bone_part_id) const + const BlendSVec& blend_cycle(const u32& bone_part_id) const { VERIFY(bone_part_id < MAX_PARTS); return (blend_cycles[bone_part_id]); diff --git a/src/Layers/xrRender/SkeletonCustom.cpp b/src/Layers/xrRender/SkeletonCustom.cpp index c7b8d3574f0..d2c9a863f95 100644 --- a/src/Layers/xrRender/SkeletonCustom.cpp +++ b/src/Layers/xrRender/SkeletonCustom.cpp @@ -52,7 +52,7 @@ LPCSTR CKinematics::LL_BoneName_dbg(u16 ID) for (_I = bone_map_N->begin(); _I != _E; ++_I) if (_I->second == ID) return *_I->first; - return 0; + return nullptr; } #ifdef DEBUG @@ -143,7 +143,7 @@ void CKinematics::IBoneInstances_Destroy() if (bone_instances) { xr_free(bone_instances); - bone_instances = NULL; + bone_instances = nullptr; } } @@ -168,8 +168,8 @@ void CKinematics::Load(const char* N, IReader* data, u32 dwFlags) // Msg ("skeleton: %s",N); inherited::Load(N, data, dwFlags); - pUserData = NULL; - m_lod = NULL; + pUserData = nullptr; + m_lod = nullptr; // loading lods IReader* LD = data->open_chunk(OGF_S_LODS); @@ -185,7 +185,7 @@ void CKinematics::Load(const char* N, IReader* data, u32 dwFlags) string_path lod_name; LD->r_string(lod_name, sizeof(lod_name)); //. strconcat (sizeof(name_load),name_load, short_name, ":lod:", lod_name.c_str()); - m_lod = (dxRender_Visual*)GlobalEnv.Render->model_CreateChild(lod_name, NULL); + m_lod = (dxRender_Visual*)GlobalEnv.Render->model_CreateChild(lod_name, nullptr); if (CKinematics* lod_kinematics = dynamic_cast(m_lod)) { @@ -216,7 +216,7 @@ void CKinematics::Load(const char* N, IReader* data, u32 dwFlags) bone_map_N = new accel(); bone_map_P = new accel(); bones = new vecBones(); - bone_instances = NULL; + bone_instances = nullptr; // Load bones #pragma todo("container is created in stack!") @@ -331,7 +331,7 @@ void CKinematics::Load(const char* N, IReader* data, u32 dwFlags) } // reset update_callback - Update_Callback = NULL; + Update_Callback = nullptr; // reset update frame wm_frame = u32(-1); @@ -436,7 +436,7 @@ void CKinematics::Spawn() // bones for (u32 i = 0; i < bones->size(); i++) bone_instances[i].construct(); - Update_Callback = NULL; + Update_Callback = nullptr; CalculateBones_Invalidate(); // wallmarks ClearWallmarks(); @@ -729,7 +729,7 @@ void CKinematics::AddWallmark( static const float LIFE_TIME = 30.f; struct zero_wm_pred : public std::unary_function, bool> { - bool operator()(const intrusive_ptr x) { return x == 0; } + bool operator()(const intrusive_ptr x) { return x == nullptr; } }; void CKinematics::CalculateWallmarks() @@ -770,7 +770,7 @@ void CKinematics::RenderWallmark(intrusive_ptr wm, FVF::LIT*& VERIFY2(bones, "Invalid visual. Bones already released."); VERIFY2(bone_instances, "Invalid visual. bone_instances already deleted."); - if ((wm == 0) || (0 == bones) || (0 == bone_instances)) + if ((wm == nullptr) || (nullptr == bones) || (nullptr == bone_instances)) return; // skin vertices diff --git a/src/Layers/xrRender/SkeletonCustom.h b/src/Layers/xrRender/SkeletonCustom.h index 51e5772ea61..43e9948174e 100644 --- a/src/Layers/xrRender/SkeletonCustom.h +++ b/src/Layers/xrRender/SkeletonCustom.h @@ -64,16 +64,18 @@ class CSkeletonWallmark : public intrusive_base // 4+4+4+12+4+16+16 = 60 + 4 = 6 } #endif - IC CKinematics* Parent() { return m_Parent; } - IC u32 VCount() { return m_Faces.size() * 3; } - IC bool Similar(ref_shader& sh, const Fvector& cp, float eps) + CKinematics* Parent() { return m_Parent; } + u32 VCount() { return m_Faces.size() * 3; } + + bool Similar(ref_shader& sh, const Fvector& cp, float eps) { return (m_Shader == sh) && m_ContactPoint.similar(cp, eps); } - IC float TimeStart() { return m_fTimeStart; } - IC const Fmatrix* XFORM() { return m_XForm; } - IC const Fvector3& ContactPoint() { return m_ContactPoint; } - IC ref_shader Shader() { return m_Shader; } + + float TimeStart() { return m_fTimeStart; } + const Fmatrix* XFORM() { return m_XForm; } + const Fvector3& ContactPoint() { return m_ContactPoint; } + ref_shader Shader() { return m_Shader; } }; DEFINE_VECTOR(intrusive_ptr, SkeletonWMVec, SkeletonWMVecIt); @@ -282,7 +284,7 @@ class CKinematics : public FHierrarhyVisual, public IKinematics virtual void Depart(); virtual void Release(); - virtual IKinematicsAnimated* dcast_PKinematicsAnimated() { return 0; } + virtual IKinematicsAnimated* dcast_PKinematicsAnimated() { return nullptr; } virtual IRenderVisual* dcast_RenderVisual() { return this; } virtual IKinematics* dcast_PKinematics() { return this; } //virtual CKinematics* dcast_PKinematics() { return this; } diff --git a/src/Layers/xrRender/SkeletonRigid.cpp b/src/Layers/xrRender/SkeletonRigid.cpp index b1afc455cbd..ff41da4a265 100644 --- a/src/Layers/xrRender/SkeletonRigid.cpp +++ b/src/Layers/xrRender/SkeletonRigid.cpp @@ -209,7 +209,7 @@ void CKinematics::BoneChain_Calculate(const CBoneData* bd, CBoneInstance& bi, u8 BOOL ow = bi.callback_overwrite(); if (ignore_callbacks) { - bi.set_callback(bi.callback_type(), 0, bi.callback_param(), 0); + bi.set_callback(bi.callback_type(), nullptr, bi.callback_param(), 0); } if (SelfID == LL_GetBoneRoot()) { diff --git a/src/Layers/xrRender/SkeletonX.cpp b/src/Layers/xrRender/SkeletonX.cpp index 98254986886..103ecce76fe 100644 --- a/src/Layers/xrRender/SkeletonX.cpp +++ b/src/Layers/xrRender/SkeletonX.cpp @@ -34,7 +34,7 @@ void CSkeletonX::AfterLoad(CKinematics* parent, u16 child_idx) } void CSkeletonX::_Copy(CSkeletonX* B) { - Parent = NULL; + Parent = nullptr; ChildIDX = B->ChildIDX; Vertices1W = B->Vertices1W; Vertices2W = B->Vertices2W; diff --git a/src/Layers/xrRender/SkeletonX.h b/src/Layers/xrRender/SkeletonX.h index 67dd22c6d9f..8a4e272982c 100644 --- a/src/Layers/xrRender/SkeletonX.h +++ b/src/Layers/xrRender/SkeletonX.h @@ -104,7 +104,7 @@ class CSkeletonX BOOL has_visible_bones(); CSkeletonX() { - Parent = 0; + Parent = nullptr; ChildIDX = u16(-1); } diff --git a/src/Layers/xrRender/Texture.cpp b/src/Layers/xrRender/Texture.cpp index df1a89e9ea1..d6069594914 100644 --- a/src/Layers/xrRender/Texture.cpp +++ b/src/Layers/xrRender/Texture.cpp @@ -125,14 +125,14 @@ void TW_Save(ID3DTexture2D* T, LPCSTR name, LPCSTR prefix, LPCSTR postfix) string256 fn2; strconcat(sizeof(fn2), fn2, "debug\\", fn, ".dds"); Log("* debug texture save: ", fn2); - R_CHK(D3DXSaveTextureToFile(fn2, D3DXIFF_DDS, T, 0)); + R_CHK(D3DXSaveTextureToFile(fn2, D3DXIFF_DDS, T, nullptr)); } ID3DTexture2D* TW_LoadTextureFromTexture( ID3DTexture2D* t_from, D3DFORMAT& t_dest_fmt, int levels_2_skip, u32& w, u32& h) { // Calculate levels & dimensions - ID3DTexture2D* t_dest = NULL; + ID3DTexture2D* t_dest = nullptr; D3DSURFACE_DESC t_from_desc0; R_CHK(t_from->GetLevelDesc(0, &t_from_desc0)); int levels_exist = t_from->GetLevelCount(); @@ -173,7 +173,7 @@ ID3DTexture2D* TW_LoadTextureFromTexture( } template -IC void TW_Iterate_1OP(ID3DTexture2D* t_dst, ID3DTexture2D* t_src, const _It pred) +void TW_Iterate_1OP(ID3DTexture2D* t_dst, ID3DTexture2D* t_src, const _It pred) { DWORD mips = t_dst->GetLevelCount(); R_ASSERT(mips == t_src->GetLevelCount()); @@ -186,8 +186,8 @@ IC void TW_Iterate_1OP(ID3DTexture2D* t_dst, ID3DTexture2D* t_src, const _It pre t_src->GetLevelDesc(i, &descS); VERIFY(desc.Format == descS.Format); VERIFY(desc.Format == D3DFMT_A8R8G8B8); - t_src->LockRect(i, &Rsrc, 0, 0); - t_dst->LockRect(i, &Rdst, 0, 0); + t_src->LockRect(i, &Rsrc, nullptr, 0); + t_dst->LockRect(i, &Rdst, nullptr, 0); for (u32 y = 0; y < desc.Height; y++) { for (u32 x = 0; x < desc.Width; x++) @@ -202,7 +202,7 @@ IC void TW_Iterate_1OP(ID3DTexture2D* t_dst, ID3DTexture2D* t_src, const _It pre } } template -IC void TW_Iterate_2OP(ID3DTexture2D* t_dst, ID3DTexture2D* t_src0, ID3DTexture2D* t_src1, const _It pred) +void TW_Iterate_2OP(ID3DTexture2D* t_dst, ID3DTexture2D* t_src0, ID3DTexture2D* t_src1, const _It pred) { DWORD mips = t_dst->GetLevelCount(); R_ASSERT(mips == t_src0->GetLevelCount()); @@ -218,9 +218,9 @@ IC void TW_Iterate_2OP(ID3DTexture2D* t_dst, ID3DTexture2D* t_src0, ID3DTexture2 VERIFY(desc.Format == descS0.Format); VERIFY(desc.Format == descS1.Format); VERIFY(desc.Format == D3DFMT_A8R8G8B8); - t_src0->LockRect(i, &Rsrc0, 0, 0); - t_src1->LockRect(i, &Rsrc1, 0, 0); - t_dst->LockRect(i, &Rdst, 0, 0); + t_src0->LockRect(i, &Rsrc0, nullptr, 0); + t_src1->LockRect(i, &Rsrc1, nullptr, 0); + t_dst->LockRect(i, &Rdst, nullptr, 0); for (u32 y = 0; y < desc.Height; y++) { for (u32 x = 0; x < desc.Width; x++) @@ -274,8 +274,8 @@ IC u32 it_height_rev_base(u32 d, u32 s) ID3DBaseTexture* CRender::texture_load(LPCSTR fRName, u32& ret_msize) { - ID3DTexture2D* pTexture2D = NULL; - IDirect3DCubeTexture9* pTextureCUBE = NULL; + ID3DTexture2D* pTexture2D = nullptr; + IDirect3DCubeTexture9* pTextureCUBE = nullptr; string_path fn; u32 dwWidth, dwHeight; u32 img_size = 0; @@ -290,7 +290,7 @@ ID3DBaseTexture* CRender::texture_load(LPCSTR fRName, u32& ret_msize) string_path fname; xr_strcpy(fname, fRName); //. andy if (strext(fname)) *strext(fname)=0; fix_texture_name(fname); - IReader* S = NULL; + IReader* S = nullptr; // if (FS.exist(fn,"$game_textures$",fname, ".dds") && strstr(fname,"_bump")) goto _BUMP; if (!FS.exist(fn, "$game_textures$", fname, ".dds") && strstr(fname, "_bump")) goto _BUMP_from_base; @@ -344,7 +344,7 @@ ID3DBaseTexture* CRender::texture_load(LPCSTR fRName, u32& ret_msize) _DDS_CUBE: { HRESULT const result = D3DXCreateCubeTextureFromFileInMemoryEx(HW.pDevice, S->pointer(), S->length(), D3DX_DEFAULT, - IMG.MipLevels, 0, IMG.Format, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, &IMG, 0, &pTextureCUBE); + IMG.MipLevels, 0, IMG.Format, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, &IMG, nullptr, &pTextureCUBE); FS.r_close(S); if (FAILED(result)) @@ -372,7 +372,7 @@ ID3DBaseTexture* CRender::texture_load(LPCSTR fRName, u32& ret_msize) ID3DTexture2D* T_sysmem; HRESULT const result = D3DXCreateTextureFromFileInMemoryEx(HW.pDevice, S->pointer(), S->length(), D3DX_DEFAULT, D3DX_DEFAULT, - IMG.MipLevels, 0, IMG.Format, D3DPOOL_SYSTEMMEM, D3DX_DEFAULT, D3DX_DEFAULT, 0, &IMG, 0, &T_sysmem); + IMG.MipLevels, 0, IMG.Format, D3DPOOL_SYSTEMMEM, D3DX_DEFAULT, D3DX_DEFAULT, 0, &IMG, nullptr, &T_sysmem); FS.r_close(S); if (FAILED(result)) @@ -504,15 +504,15 @@ ID3DBaseTexture* CRender::texture_load(LPCSTR fRName, u32& ret_msize) img_size = S->length(); ID3DTexture2D* T_base; R_CHK2(D3DXCreateTextureFromFileInMemoryEx(HW.pDevice, S->pointer(), S->length(), D3DX_DEFAULT, D3DX_DEFAULT, - D3DX_DEFAULT, 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, D3DX_DEFAULT, D3DX_DEFAULT, 0, &IMG, 0, &T_base), fn); + D3DX_DEFAULT, 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, D3DX_DEFAULT, D3DX_DEFAULT, 0, &IMG, nullptr, &T_base), fn); FS.r_close(S); // Create HW-surface - ID3DTexture2D* T_normal_1 = 0; + ID3DTexture2D* T_normal_1 = nullptr; R_CHK(D3DXCreateTexture( HW.pDevice, IMG.Width, IMG.Height, D3DX_DEFAULT, 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &T_normal_1)); R_CHK(D3DXComputeNormalMap( - T_normal_1, T_base, 0, D3DX_NORMALMAP_COMPUTE_OCCLUSION, D3DX_CHANNEL_LUMINANCE, _BUMPHEIGH)); + T_normal_1, T_base, nullptr, D3DX_NORMALMAP_COMPUTE_OCCLUSION, D3DX_CHANNEL_LUMINANCE, _BUMPHEIGH)); // Transfer gloss-map TW_Iterate_1OP(T_normal_1, T_base, it_gloss_rev_base); diff --git a/src/Layers/xrRender/TextureDescrManager.h b/src/Layers/xrRender/TextureDescrManager.h index 414e5819502..d20b363eecb 100644 --- a/src/Layers/xrRender/TextureDescrManager.h +++ b/src/Layers/xrRender/TextureDescrManager.h @@ -26,7 +26,7 @@ class CTextureDescrMngr { texture_assoc* m_assoc; texture_spec* m_spec; - texture_desc() : m_assoc(NULL), m_spec(NULL) {} + texture_desc() : m_assoc(nullptr), m_spec(nullptr) {} }; DEFINE_MAP(shared_str, texture_desc, map_TD, map_TDIt); DEFINE_MAP(shared_str, cl_dt_scaler*, map_CS, map_CSIt); diff --git a/src/Layers/xrRender/WallmarksEngine.cpp b/src/Layers/xrRender/WallmarksEngine.cpp index e6df82ff667..b7152a38955 100644 --- a/src/Layers/xrRender/WallmarksEngine.cpp +++ b/src/Layers/xrRender/WallmarksEngine.cpp @@ -58,7 +58,7 @@ CWallmarksEngine::CWallmarksEngine() { static_pool.reserve(256); marks.reserve(256); - hGeom.create(FVF::F_LIT, RCache.Vertex.Buffer(), NULL); + hGeom.create(FVF::F_LIT, RCache.Vertex.Buffer(), nullptr); } CWallmarksEngine::~CWallmarksEngine() @@ -88,7 +88,7 @@ void CWallmarksEngine::clear() // allocate CWallmarksEngine::static_wallmark* CWallmarksEngine::static_wm_allocate() { - static_wallmark* W = 0; + static_wallmark* W = nullptr; if (static_pool.empty()) W = new static_wallmark(); else @@ -333,7 +333,7 @@ void CWallmarksEngine::AddSkeletonWallmark(intrusive_ptr wm) lock.Enter(); // search if similar wallmark exists wm_slot* slot = FindSlot(wm->Shader()); - if (0 == slot) + if (nullptr == slot) slot = AppendSlot(wm->Shader()); // no similar - register _new_ slot->skeleton_items.push_back(wm); diff --git a/src/Layers/xrRender/blenders/Blender.cpp b/src/Layers/xrRender/blenders/Blender.cpp index 67e902d6c0b..1dbd7880c8a 100644 --- a/src/Layers/xrRender/blenders/Blender.cpp +++ b/src/Layers/xrRender/blenders/Blender.cpp @@ -14,7 +14,7 @@ void CBlender_DESC::Setup(LPCSTR N) { // Name VERIFY(xr_strlen(N) < 128); - VERIFY(0 == strchr(N, '.')); + VERIFY(nullptr == strchr(N, '.')); xr_strcpy(cName, N); _strlwr(cName); diff --git a/src/Layers/xrRender/blenders/Blender_Recorder.cpp b/src/Layers/xrRender/blenders/Blender_Recorder.cpp index 0a13a62b247..48c5e150a57 100644 --- a/src/Layers/xrRender/blenders/Blender_Recorder.cpp +++ b/src/Layers/xrRender/blenders/Blender_Recorder.cpp @@ -48,9 +48,9 @@ void CBlender_Compile::_cpp_Compile(ShaderElement* _SH) // optimization? // Analyze possibility to detail this shader - detail_texture = NULL; - detail_scaler = NULL; - LPCSTR base = NULL; + detail_texture = nullptr; + detail_scaler = nullptr; + LPCSTR base = nullptr; if (bDetail && BT->canBeDetailed()) { // diff --git a/src/Layers/xrRender/dxApplicationRender.cpp b/src/Layers/xrRender/dxApplicationRender.cpp index e74f1ca2984..3291336da7b 100644 --- a/src/Layers/xrRender/dxApplicationRender.cpp +++ b/src/Layers/xrRender/dxApplicationRender.cpp @@ -13,7 +13,7 @@ void dxApplicationRender::LoadBegin() sh_progress.create("hud\\default", "ui\\ui_actor_loadgame_screen"); hLevelLogo_Add.create("hud\\default", "ui\\ui_actor_widescreen_sidepanels.dds"); - ll_hGeom2.create(FVF::F_TL, RCache.Vertex.Buffer(), NULL); + ll_hGeom2.create(FVF::F_TL, RCache.Vertex.Buffer(), nullptr); } void dxApplicationRender::destroy_loading_shaders() @@ -40,7 +40,7 @@ void dxApplicationRender::load_draw_internal(CApplication& owner) FLOAT ColorRGBA[4] = {0.0f, 0.0f, 0.0f, 0.0f}; HW.pContext->ClearRenderTargetView(RCache.get_RT(), ColorRGBA); #else // USE_DX10 - CHK_DX(HW.pDevice->Clear(0, 0, D3DCLEAR_TARGET, D3DCOLOR_ARGB(0, 0, 0, 0), 1, 0)); + CHK_DX(HW.pDevice->Clear(0, nullptr, D3DCLEAR_TARGET, D3DCOLOR_ARGB(0, 0, 0, 0), 1, 0)); #endif // USE_DX10 if (!sh_progress) @@ -108,7 +108,7 @@ void dxApplicationRender::load_draw_internal(CApplication& owner) u32 Offset; u32 C = 0xffffffff; - FVF::TL* pv = NULL; + FVF::TL* pv = nullptr; u32 v_cnt = 40; pv = (FVF::TL*)RCache.Vertex.Lock(2 * (v_cnt + 1), ll_hGeom2.stride(), Offset); FVF::TL* _pv = pv; @@ -241,7 +241,7 @@ void dxApplicationRender::draw_face(ref_shader& sh, Frect& coords, Frect& tex_co { u32 Offset; u32 C = 0xffffffff; - FVF::TL* pv = NULL; + FVF::TL* pv = nullptr; tex_coords.lt.x /= tsz.x; tex_coords.lt.y /= tsz.y; @@ -294,7 +294,7 @@ void draw_multiline_text(CGameFont* F, float fTargetWidth, LPCSTR pszText) LPCSTR ch = pszText; float curr_word_len = 0.0f; - LPCSTR next_word = NULL; + LPCSTR next_word = nullptr; float curr_len = 0.0f; string512 buff; diff --git a/src/Layers/xrRender/dxEnvironmentRender.cpp b/src/Layers/xrRender/dxEnvironmentRender.cpp index 7c8232802bd..771e1daa362 100644 --- a/src/Layers/xrRender/dxEnvironmentRender.cpp +++ b/src/Layers/xrRender/dxEnvironmentRender.cpp @@ -72,7 +72,7 @@ void dxEnvDescriptorMixerRender::Destroy() void dxEnvDescriptorMixerRender::Clear() { - std::pair zero = std::make_pair(u32(0), ref_texture(0)); + std::pair zero = std::make_pair(u32(0), ref_texture(nullptr)); sky_r_textures.clear(); sky_r_textures.push_back(zero); sky_r_textures.push_back(zero); @@ -188,7 +188,7 @@ void dxEnvironmentRender::OnLoad() tonemap = RImplementation.Resources->_CreateTexture("$user$tonemap"); //. hack } -void dxEnvironmentRender::OnUnload() { tonemap = 0; } +void dxEnvironmentRender::OnUnload() { tonemap = nullptr; } void dxEnvironmentRender::RenderSky(CEnvironment& env) { // clouds_sh.create ("clouds","null"); @@ -307,8 +307,8 @@ void dxEnvironmentRender::OnDeviceCreate() void dxEnvironmentRender::OnDeviceDestroy() { - tsky0->surface_set(NULL); - tsky1->surface_set(NULL); + tsky0->surface_set(nullptr); + tsky1->surface_set(nullptr); sh_2sky.destroy(); sh_2geom.destroy(); diff --git a/src/Layers/xrRender/dxFontRender.cpp b/src/Layers/xrRender/dxFontRender.cpp index 4cf4e07616b..df39453cc39 100644 --- a/src/Layers/xrRender/dxFontRender.cpp +++ b/src/Layers/xrRender/dxFontRender.cpp @@ -63,7 +63,7 @@ void dxFontRender::OnRender(CGameFont& owner) CGameFont::String& PS = owner.strings[i]; wchar_t wsStr[MAX_MB_CHARS]; - int len = owner.IsMultibyte() ? mbhMulti2Wide(wsStr, NULL, MAX_MB_CHARS, PS.string) : xr_strlen(PS.string); + int len = owner.IsMultibyte() ? mbhMulti2Wide(wsStr, nullptr, MAX_MB_CHARS, PS.string) : xr_strlen(PS.string); if (len) { diff --git a/src/Layers/xrRender/dxRainRender.cpp b/src/Layers/xrRender/dxRainRender.cpp index 260f7e8275d..bf07ec4e748 100644 --- a/src/Layers/xrRender/dxRainRender.cpp +++ b/src/Layers/xrRender/dxRainRender.cpp @@ -198,7 +198,7 @@ void dxRainRender::Render(CEffect_Rain& owner) // Particles CEffect_Rain::Particle* P = owner.particle_active; - if (0 == P) + if (nullptr == P) return; { diff --git a/src/Layers/xrRender/dxStatGraphRender.cpp b/src/Layers/xrRender/dxStatGraphRender.cpp index 768d9f89230..a9535ce2e4b 100644 --- a/src/Layers/xrRender/dxStatGraphRender.cpp +++ b/src/Layers/xrRender/dxStatGraphRender.cpp @@ -44,9 +44,9 @@ void dxStatGraphRender::OnRender(CStatGraph& owner) }; u32 dwOffsetTri = 0, dwOffsetLine = 0, dwCount; - FVF::TL0uv* pv_Tri_start = NULL; + FVF::TL0uv* pv_Tri_start = nullptr; FVF::TL0uv* pv_Tri; - FVF::TL0uv* pv_Line_start = NULL; + FVF::TL0uv* pv_Line_start = nullptr; FVF::TL0uv* pv_Line; if (TriElem) diff --git a/src/Layers/xrRender/dxThunderboltDescRender.cpp b/src/Layers/xrRender/dxThunderboltDescRender.cpp index c03dc9e787f..1b1da856639 100644 --- a/src/Layers/xrRender/dxThunderboltDescRender.cpp +++ b/src/Layers/xrRender/dxThunderboltDescRender.cpp @@ -4,7 +4,7 @@ void dxThunderboltDescRender::Copy(IThunderboltDescRender& _in) { *this = *((dxThunderboltDescRender*)&_in); } void dxThunderboltDescRender::CreateModel(LPCSTR m_name) { - IReader* F = 0; + IReader* F = nullptr; F = FS.r_open("$game_meshes$", m_name); R_ASSERT2(F, "Empty 'lightning_model'."); l_model = ::RImplementation.model_CreateDM(F); diff --git a/src/Layers/xrRender/dxUIRender.h b/src/Layers/xrRender/dxUIRender.h index d52ce4b4ee7..b5b43c8e32e 100644 --- a/src/Layers/xrRender/dxUIRender.h +++ b/src/Layers/xrRender/dxUIRender.h @@ -23,7 +23,7 @@ class dxUIRender : public IUIRender //. virtual void FlushLineStrip(); //. virtual void StartLineList(u32 iMaxVerts); //. virtual void FlushLineList(); - virtual void SetScissor(Irect* rect = NULL); + virtual void SetScissor(Irect* rect = nullptr); virtual void GetActiveTextureResolution(Fvector2& res); //. virtual void PushPoint(float x, float y, u32 c, float u, float v); diff --git a/src/Layers/xrRender/dxUISequenceVideoItem.cpp b/src/Layers/xrRender/dxUISequenceVideoItem.cpp index 0d45b0e117e..f0179f1baa1 100644 --- a/src/Layers/xrRender/dxUISequenceVideoItem.cpp +++ b/src/Layers/xrRender/dxUISequenceVideoItem.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "dxUISequenceVideoItem.h" -dxUISequenceVideoItem::dxUISequenceVideoItem() { m_texture = 0; } +dxUISequenceVideoItem::dxUISequenceVideoItem() { m_texture = nullptr; } void dxUISequenceVideoItem::Copy(IUISequenceVideoItem& _in) { *this = *((dxUISequenceVideoItem*)&_in); } void dxUISequenceVideoItem::CaptureTexture() { m_texture = RCache.get_ActiveTexture(0); } diff --git a/src/Layers/xrRender/dxUISequenceVideoItem.h b/src/Layers/xrRender/dxUISequenceVideoItem.h index 604e59ab64e..cc662e264b3 100644 --- a/src/Layers/xrRender/dxUISequenceVideoItem.h +++ b/src/Layers/xrRender/dxUISequenceVideoItem.h @@ -12,7 +12,7 @@ class dxUISequenceVideoItem : public IUISequenceVideoItem virtual bool HasTexture() { return !!m_texture; } virtual void CaptureTexture(); - virtual void ResetTexture() { m_texture = 0; } + virtual void ResetTexture() { m_texture = nullptr; } virtual BOOL video_IsPlaying() { return m_texture->video_IsPlaying(); } virtual void video_Sync(u32 _time) { m_texture->video_Sync(_time); } virtual void video_Play(BOOL looped, u32 _time = 0xFFFFFFFF) { return m_texture->video_Play(looped, _time); } diff --git a/src/Layers/xrRender/dxUIShader.h b/src/Layers/xrRender/dxUIShader.h index 81c0f5babb0..b2da07cfaa4 100644 --- a/src/Layers/xrRender/dxUIShader.h +++ b/src/Layers/xrRender/dxUIShader.h @@ -14,7 +14,7 @@ class dxUIShader : public IUIShader public: virtual ~dxUIShader() { ; } virtual void Copy(IUIShader& _in); - virtual void create(LPCSTR sh, LPCSTR tex = 0); + virtual void create(LPCSTR sh, LPCSTR tex = nullptr); virtual bool inited() { return hShader; } virtual void destroy(); diff --git a/src/Layers/xrRender/occRasterizer.h b/src/Layers/xrRender/occRasterizer.h index 715efd64192..9bb0381c44b 100644 --- a/src/Layers/xrRender/occRasterizer.h +++ b/src/Layers/xrRender/occRasterizer.h @@ -36,12 +36,12 @@ class occRasterizer occD bufDepth_3[occ_dim_3][occ_dim_3]; public: - IC int df_2_s32(float d) { return iFloor(d * occQ_s32); } - IC s16 df_2_s16(float d) { return s16(iFloor(d * occQ_s16)); } - IC int df_2_s32up(float d) { return iCeil(d * occQ_s32); } - IC s16 df_2_s16up(float d) { return s16(iCeil(d * occQ_s16)); } - IC float ds32_2_f(s32 d) { return float(d) / occQ_s32; } - IC float ds16_2_f(s16 d) { return float(d) / occQ_s16; } + int df_2_s32(float d) { return iFloor(d * occQ_s32); } + s16 df_2_s16(float d) { return s16(iFloor(d * occQ_s16)); } + int df_2_s32up(float d) { return iCeil(d * occQ_s32); } + s16 df_2_s16up(float d) { return s16(iCeil(d * occQ_s16)); } + float ds32_2_f(s32 d) { return float(d) / occQ_s32; } + float ds16_2_f(s16 d) { return float(d) / occQ_s16; } void clear(); void propagade(); u32 rasterize(occTri* T); @@ -57,7 +57,7 @@ class occRasterizer case 1: return &(bufDepth_1[0][0]); case 2: return &(bufDepth_2[0][0]); case 3: return &(bufDepth_3[0][0]); - default: return NULL; + default: return nullptr; } } diff --git a/src/Layers/xrRender/occRasterizer_core.cpp b/src/Layers/xrRender/occRasterizer_core.cpp index 274e5344a97..80fd488e309 100644 --- a/src/Layers/xrRender/occRasterizer_core.cpp +++ b/src/Layers/xrRender/occRasterizer_core.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "occRasterizer.h" -static occTri* currentTri = 0; +static occTri* currentTri = nullptr; static u32 dwPixels = 0; static float currentA[3], currentB[3], currentC[3]; diff --git a/src/Layers/xrRender/r__dsgraph_build.cpp b/src/Layers/xrRender/r__dsgraph_build.cpp index cfa858dfdac..335cf758c89 100644 --- a/src/Layers/xrRender/r__dsgraph_build.cpp +++ b/src/Layers/xrRender/r__dsgraph_build.cpp @@ -70,7 +70,7 @@ void D3DXRenderBase::r_dsgraph_insert_dynamic(dxRender_Visual* pVisual, Fvector& // Select shader ShaderElement* sh = RImplementation.rimp_select_sh_dynamic(pVisual, distSQ); - if (0 == sh) + if (nullptr == sh) return; if (!pmask[sh->flags.iPriority / 2]) return; @@ -289,7 +289,7 @@ void D3DXRenderBase::r_dsgraph_insert_static(dxRender_Visual* pVisual) { mapSorted_Node* N = mapDistort.insertInAnyWay(distSQ); N->val.ssa = SSA; - N->val.pObject = NULL; + N->val.pObject = nullptr; N->val.pVisual = pVisual; N->val.Matrix = Fidentity; N->val.se = &*pVisual->shader->E[4]; // 4=L_special @@ -297,7 +297,7 @@ void D3DXRenderBase::r_dsgraph_insert_static(dxRender_Visual* pVisual) // Select shader ShaderElement* sh = RImplementation.rimp_select_sh_static(pVisual, distSQ); - if (0 == sh) + if (nullptr == sh) return; if (!pmask[sh->flags.iPriority / 2]) return; @@ -306,7 +306,7 @@ void D3DXRenderBase::r_dsgraph_insert_static(dxRender_Visual* pVisual) if (sh->flags.bStrictB2F) { mapSorted_Node* N = mapSorted.insertInAnyWay(distSQ); - N->val.pObject = NULL; + N->val.pObject = nullptr; N->val.pVisual = pVisual; N->val.Matrix = Fidentity; N->val.se = sh; @@ -461,7 +461,7 @@ void D3DXRenderBase::r_dsgraph_insert_static(dxRender_Visual* pVisual) //////////////////////////////////////////////////////////////////////////////////////////////////// void CRender::add_leafs_Dynamic(dxRender_Visual* pVisual) { - if (0 == pVisual) + if (nullptr == pVisual) return; // Visual is 100% visible - simply add it @@ -891,9 +891,9 @@ D3DXRenderBase::D3DXRenderBase() val_bHUD = FALSE; val_bInvisible = FALSE; val_bRecordMP = FALSE; - val_feedback = 0; + val_feedback = nullptr; val_feedback_breakp = 0; - val_recorder = 0; + val_recorder = nullptr; marker = 0; r_pmask(true, true); b_loaded = FALSE; @@ -1068,7 +1068,7 @@ void D3DXRenderBase::overdrawEnd() CHK_DX(HW.pDevice->SetRenderState(D3DRS_STENCILFUNC, D3DCMP_EQUAL)); CHK_DX(HW.pDevice->SetRenderState(D3DRS_STENCILMASK, 0xff)); // Set the background to black - CHK_DX(HW.pDevice->Clear(0, 0, D3DCLEAR_TARGET, color_xrgb(255, 0, 0), 0, 0)); + CHK_DX(HW.pDevice->Clear(0, nullptr, D3DCLEAR_TARGET, color_xrgb(255, 0, 0), 0, 0)); // Draw a rectangle wherever the count equal I RCache.OnFrameEnd(); CHK_DX(HW.pDevice->SetFVF(FVF::F_TL)); @@ -1145,7 +1145,7 @@ void D3DXRenderBase::Clear() HW.pContext->ClearRenderTargetView(RCache.get_RT(), ColorRGBA); } #else - CHK_DX(HW.pDevice->Clear(0, 0, D3DCLEAR_ZBUFFER | (psDeviceFlags.test(rsClearBB) ? D3DCLEAR_TARGET : 0) | + CHK_DX(HW.pDevice->Clear(0, nullptr, D3DCLEAR_ZBUFFER | (psDeviceFlags.test(rsClearBB) ? D3DCLEAR_TARGET : 0) | (HW.Caps.bStencil ? D3DCLEAR_STENCIL : 0), color_xrgb(0, 0, 0), 1, 0)); #endif } @@ -1165,7 +1165,7 @@ void D3DXRenderBase::End() HW.m_pSwapChain->Present(bUseVSync ? 1 : 0, 0); #else CHK_DX(HW.pDevice->EndScene()); - HW.pDevice->Present(NULL, NULL, NULL, NULL); + HW.pDevice->Present(nullptr, nullptr, nullptr, nullptr); #endif } @@ -1176,7 +1176,7 @@ void D3DXRenderBase::ClearTarget() FLOAT ColorRGBA[4] = {0.0f, 0.0f, 0.0f, 0.0f}; HW.pContext->ClearRenderTargetView(RCache.get_RT(), ColorRGBA); #else - CHK_DX(HW.pDevice->Clear(0, 0, D3DCLEAR_TARGET, color_xrgb(0, 0, 0), 1, 0)); + CHK_DX(HW.pDevice->Clear(0, nullptr, D3DCLEAR_TARGET, color_xrgb(0, 0, 0), 1, 0)); #endif } diff --git a/src/Layers/xrRender/r__dsgraph_render.cpp b/src/Layers/xrRender/r__dsgraph_render.cpp index 5b7dd9a939a..4ea8903cb9d 100644 --- a/src/Layers/xrRender/r__dsgraph_render.cpp +++ b/src/Layers/xrRender/r__dsgraph_render.cpp @@ -753,7 +753,7 @@ void D3DXRenderBase::r_dsgraph_render_subspace(IRender_Sector* _sector, CFrustum if (_dynamic) { - set_Object(0); + set_Object(nullptr); // Traverse object database g_SpatialSpace->q_frustum(lstRenderables, ISpatial_DB::O_ORDERED, STYPE_RENDERABLE, ViewBase); @@ -763,7 +763,7 @@ void D3DXRenderBase::r_dsgraph_render_subspace(IRender_Sector* _sector, CFrustum { ISpatial* spatial = lstRenderables[o_it]; CSector* sector = (CSector*)spatial->GetSpatialData().sector; - if (0 == sector) + if (nullptr == sector) continue; // disassociated from S/P structure if (PortalTraverser.i_marker != sector->r_marker) continue; // inactive (untouched) sector @@ -775,7 +775,7 @@ void D3DXRenderBase::r_dsgraph_render_subspace(IRender_Sector* _sector, CFrustum // renderable IRenderable* renderable = spatial->dcast_Renderable(); - if (0 == renderable) + if (nullptr == renderable) continue; // unknown, but renderable object (r1_glow???) renderable->renderable_Render(); @@ -785,7 +785,7 @@ void D3DXRenderBase::r_dsgraph_render_subspace(IRender_Sector* _sector, CFrustum // Restore ViewBase = ViewSave; - View = 0; + View = nullptr; } #include "FHierrarhyVisual.h" diff --git a/src/Layers/xrRender/r__dsgraph_types.h b/src/Layers/xrRender/r__dsgraph_types.h index 4c81db3cf00..07131285e47 100644 --- a/src/Layers/xrRender/r__dsgraph_types.h +++ b/src/Layers/xrRender/r__dsgraph_types.h @@ -36,7 +36,7 @@ class doug_lea_alloc { return (*this); } - pointer allocate(size_type n, const void* /*p*/ = 0) const + pointer allocate(size_type n, const void* /*p*/ = nullptr) const { return (T*)g_render_allocator.malloc_impl(sizeof(T) * (u32)n); } @@ -53,12 +53,12 @@ class doug_lea_alloc }; template -inline bool operator==(const doug_lea_alloc<_Ty>&, const doug_lea_alloc<_Other>&) +bool operator==(const doug_lea_alloc<_Ty>&, const doug_lea_alloc<_Other>&) { return (true); } template -inline bool operator!=(const doug_lea_alloc<_Ty>&, const doug_lea_alloc<_Other>&) +bool operator!=(const doug_lea_alloc<_Ty>&, const doug_lea_alloc<_Other>&) { return (false); } diff --git a/src/Layers/xrRender/r__screenshot.cpp b/src/Layers/xrRender/r__screenshot.cpp index f7949c332e5..fa9e1767e4a 100644 --- a/src/Layers/xrRender/r__screenshot.cpp +++ b/src/Layers/xrRender/r__screenshot.cpp @@ -238,7 +238,7 @@ void CRender::ScreenshotImpl(ScreenshotMode mode, LPCSTR name, CMemoryWriter* me if ((psDeviceFlags.test(rsFullscreen)) == 0) { if (name && FS.exist(name)) - FS.file_delete(0, name); + FS.file_delete(nullptr, name); Log("~ Can't capture screen while in windowed mode..."); return; @@ -249,7 +249,7 @@ void CRender::ScreenshotImpl(ScreenshotMode mode, LPCSTR name, CMemoryWriter* me D3DLOCKED_RECT D; HRESULT hr; hr = HW.pDevice->CreateOffscreenPlainSurface( - Device.dwWidth, Device.dwHeight, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &pFB, NULL); + Device.dwWidth, Device.dwHeight, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &pFB, nullptr); if (hr != D3D_OK) return; @@ -257,7 +257,7 @@ void CRender::ScreenshotImpl(ScreenshotMode mode, LPCSTR name, CMemoryWriter* me if (hr != D3D_OK) return; - hr = pFB->LockRect(&D, 0, D3DLOCK_NOSYSLOCK); + hr = pFB->LockRect(&D, nullptr, D3DLOCK_NOSYSLOCK); if (hr != D3D_OK) return; @@ -300,27 +300,27 @@ void CRender::ScreenshotImpl(ScreenshotMode mode, LPCSTR name, CMemoryWriter* me case IRender::SM_FOR_GAMESAVE: { // texture - ID3DTexture2D* texture = NULL; + ID3DTexture2D* texture = nullptr; hr = D3DXCreateTexture(HW.pDevice, GAMESAVE_SIZE, GAMESAVE_SIZE, 1, 0, D3DFMT_DXT1, D3DPOOL_SCRATCH, &texture); if (hr != D3D_OK) goto _end_; - if (NULL == texture) + if (nullptr == texture) goto _end_; // resize&convert to surface - IDirect3DSurface9* surface = 0; + IDirect3DSurface9* surface = nullptr; hr = texture->GetSurfaceLevel(0, &surface); if (hr != D3D_OK) goto _end_; VERIFY(surface); - hr = D3DXLoadSurfaceFromSurface(surface, 0, 0, pFB, 0, 0, D3DX_DEFAULT, 0); + hr = D3DXLoadSurfaceFromSurface(surface, nullptr, nullptr, pFB, nullptr, nullptr, D3DX_DEFAULT, 0); _RELEASE(surface); if (hr != D3D_OK) goto _end_; // save (logical & physical) - ID3DBlob* saved = 0; - hr = D3DXSaveTextureToFileInMemory(&saved, D3DXIFF_DDS, texture, 0); + ID3DBlob* saved = nullptr; + hr = D3DXSaveTextureToFileInMemory(&saved, D3DXIFF_DDS, texture, nullptr); if (hr != D3D_OK) goto _end_; @@ -339,28 +339,28 @@ void CRender::ScreenshotImpl(ScreenshotMode mode, LPCSTR name, CMemoryWriter* me case IRender::SM_FOR_MPSENDING: { // texture - ID3DTexture2D* texture = NULL; + ID3DTexture2D* texture = nullptr; hr = D3DXCreateTexture( HW.pDevice, SM_FOR_SEND_WIDTH, SM_FOR_SEND_HEIGHT, 1, 0, D3DFMT_R8G8B8, D3DPOOL_SCRATCH, &texture); if (hr != D3D_OK) goto _end_; - if (NULL == texture) + if (nullptr == texture) goto _end_; // resize&convert to surface - IDirect3DSurface9* surface = 0; + IDirect3DSurface9* surface = nullptr; hr = texture->GetSurfaceLevel(0, &surface); if (hr != D3D_OK) goto _end_; VERIFY(surface); - hr = D3DXLoadSurfaceFromSurface(surface, 0, 0, pFB, 0, 0, D3DX_DEFAULT, 0); + hr = D3DXLoadSurfaceFromSurface(surface, nullptr, nullptr, pFB, nullptr, nullptr, D3DX_DEFAULT, 0); _RELEASE(surface); if (hr != D3D_OK) goto _end_; // save (logical & physical) - ID3DBlob* saved = 0; - hr = D3DXSaveTextureToFileInMemory(&saved, D3DXIFF_DDS, texture, 0); + ID3DBlob* saved = nullptr; + hr = D3DXSaveTextureToFileInMemory(&saved, D3DXIFF_DDS, texture, nullptr); if (hr != D3D_OK) goto _end_; @@ -390,8 +390,8 @@ void CRender::ScreenshotImpl(ScreenshotMode mode, LPCSTR name, CMemoryWriter* me string_path buf; xr_sprintf(buf, sizeof(buf), "ss_%s_%s_(%s).jpg", Core.UserName, timestamp(t_stemp), (g_pGameLevel) ? g_pGameLevel->name().c_str() : "mainmenu"); - ID3DBlob* saved = 0; - CHK_DX(D3DXSaveSurfaceToFileInMemory(&saved, D3DXIFF_JPG, pFB, 0, 0)); + ID3DBlob* saved = nullptr; + CHK_DX(D3DXSaveSurfaceToFileInMemory(&saved, D3DXIFF_JPG, pFB, nullptr, nullptr)); IWriter* fs = FS.w_open("$screenshots$", buf); R_ASSERT(fs); fs->w(saved->GetBufferPointer(), saved->GetBufferSize()); @@ -401,8 +401,8 @@ void CRender::ScreenshotImpl(ScreenshotMode mode, LPCSTR name, CMemoryWriter* me { // hq xr_sprintf(buf, sizeof(buf), "ssq_%s_%s_(%s).tga", Core.UserName, timestamp(t_stemp), (g_pGameLevel) ? g_pGameLevel->name().c_str() : "mainmenu"); - ID3DBlob* saved = 0; - CHK_DX(D3DXSaveSurfaceToFileInMemory(&saved, D3DXIFF_TGA, pFB, 0, 0)); + ID3DBlob* saved = nullptr; + CHK_DX(D3DXSaveSurfaceToFileInMemory(&saved, D3DXIFF_TGA, pFB, nullptr, nullptr)); IWriter* fs = FS.w_open("$screenshots$", buf); R_ASSERT(fs); fs->w(saved->GetBufferPointer(), saved->GetBufferSize()); @@ -422,7 +422,7 @@ void CRender::ScreenshotImpl(ScreenshotMode mode, LPCSTR name, CMemoryWriter* me R_ASSERT(fs); // TODO: DX10: This is totally incorrect but mimics // original behavior. Fix later. - hr = pFB->LockRect(&D, 0, D3DLOCK_NOSYSLOCK); + hr = pFB->LockRect(&D, nullptr, D3DLOCK_NOSYSLOCK); if (hr != D3D_OK) return; hr = pFB->UnlockRect(); @@ -448,7 +448,7 @@ void CRender::ScreenshotImpl(ScreenshotMode mode, LPCSTR name, CMemoryWriter* me #endif // USE_DX10 -void CRender::Screenshot(ScreenshotMode mode, LPCSTR name) { ScreenshotImpl(mode, name, NULL); } +void CRender::Screenshot(ScreenshotMode mode, LPCSTR name) { ScreenshotImpl(mode, name, nullptr); } void CRender::Screenshot(ScreenshotMode mode, CMemoryWriter& memory_writer) { if (mode != SM_FOR_MPSENDING) @@ -456,7 +456,7 @@ void CRender::Screenshot(ScreenshotMode mode, CMemoryWriter& memory_writer) Log("~ Not implemented screenshot mode..."); return; } - ScreenshotImpl(mode, NULL, &memory_writer); + ScreenshotImpl(mode, nullptr, &memory_writer); } void CRender::ScreenshotAsyncBegin() @@ -520,7 +520,7 @@ void CRender::ScreenshotAsyncEnd(CMemoryWriter& memory_writer) pFB = Target->pFB; - hr = pFB->LockRect(&D, 0, D3DLOCK_NOSYSLOCK); + hr = pFB->LockRect(&D, nullptr, D3DLOCK_NOSYSLOCK); if (hr != D3D_OK) return; diff --git a/src/Layers/xrRender/r__sector.cpp b/src/Layers/xrRender/r__sector.cpp index 029fed53840..b196eaa3e62 100644 --- a/src/Layers/xrRender/r__sector.cpp +++ b/src/Layers/xrRender/r__sector.cpp @@ -189,7 +189,7 @@ void CSector::traverse(CFrustum& F, _scissor& R_scissor) S.assign(&*POLY.begin(), POLY.size()); D.clear(); sPoly* P = F.ClipPoly(S, D); - if (0 == P) + if (nullptr == P) continue; // Scissor and optimized HOM-testing @@ -304,7 +304,7 @@ void CSector::load(IReader& fs) } if (g_dedicated_server) - m_root = 0; + m_root = nullptr; else { // Assign visual diff --git a/src/Layers/xrRender/r__sector.h b/src/Layers/xrRender/r__sector.h index 39fd3f181ea..4e76b488b9e 100644 --- a/src/Layers/xrRender/r__sector.h +++ b/src/Layers/xrRender/r__sector.h @@ -82,7 +82,7 @@ class CSector : public IRender_Sector void traverse(CFrustum& F, _scissor& R); void load(IReader& fs); - CSector() { m_root = NULL; } + CSector() { m_root = nullptr; } virtual ~CSector(); }; diff --git a/src/Layers/xrRender/r__sector_traversal.cpp b/src/Layers/xrRender/r__sector_traversal.cpp index 99c36685e51..795ec90cef8 100644 --- a/src/Layers/xrRender/r__sector_traversal.cpp +++ b/src/Layers/xrRender/r__sector_traversal.cpp @@ -57,7 +57,7 @@ void CPortalTraverser::fade_portal(CPortal* _p, float ssa) { f_portals.push_back void CPortalTraverser::initialize() { f_shader.create("portal"); - f_geom.create(FVF::F_L, RCache.Vertex.Buffer(), 0); + f_geom.create(FVF::F_L, RCache.Vertex.Buffer(), nullptr); } void CPortalTraverser::destroy() { diff --git a/src/Layers/xrRender/r_constants.cpp b/src/Layers/xrRender/r_constants.cpp index 020297183a2..38d2e0532da 100644 --- a/src/Layers/xrRender/r_constants.cpp +++ b/src/Layers/xrRender/r_constants.cpp @@ -26,7 +26,7 @@ ref_constant R_constant_table::get(LPCSTR S) // assumption - sorted by name c_table::iterator I = std::lower_bound(table.begin(), table.end(), S, p_search); if (I == table.end() || (0 != xr_strcmp(*(*I)->name, S))) - return 0; + return nullptr; else return *I; } @@ -41,7 +41,7 @@ ref_constant R_constant_table::get(shared_str& S) if (C->name.equal(S)) return C; } - return 0; + return nullptr; } #if !defined(USE_DX10) && !defined(USE_DX11) @@ -178,7 +178,7 @@ BOOL R_constant_table::parse(void* _desc, u32 destination) /// !!!!!!!!FIX THIS FOR DX11!!!!!!!!! void R_constant_table::merge(R_constant_table* T) { - if (0 == T) + if (nullptr == T) return; // Real merge diff --git a/src/Layers/xrRender/r_constants.h b/src/Layers/xrRender/r_constants.h index 18062620d0b..ead4ac26009 100644 --- a/src/Layers/xrRender/r_constants.h +++ b/src/Layers/xrRender/r_constants.h @@ -74,7 +74,7 @@ struct ECORE_API R_constant_load R_constant_load() : index(u16(-1)), cls(u16(-1)){}; - IC BOOL equal(R_constant_load& C) { return (index == C.index) && (cls == C.cls); } + BOOL equal(R_constant_load& C) { return (index == C.index) && (cls == C.cls); } }; struct ECORE_API R_constant : public xr_resource @@ -96,9 +96,9 @@ struct ECORE_API R_constant : public xr_resource R_constant_load samp; R_constant_setup* handler; - R_constant() : type(u16(-1)), destination(0), handler(NULL){}; + R_constant() : type(u16(-1)), destination(0), handler(nullptr){}; - IC R_constant_load& get_load(u32 destination) + R_constant_load& get_load(u32 destination) { static R_constant_load fake; switch (destination & 0xFF) @@ -118,12 +118,13 @@ struct ECORE_API R_constant : public xr_resource return fake; } - IC BOOL equal(R_constant& C) + BOOL equal(R_constant& C) { return (!xr_strcmp(name, C.name)) && (type == C.type) && (destination == C.destination) && ps.equal(C.ps) && vs.equal(C.vs) && samp.equal(C.samp) && handler == C.handler; } - IC BOOL equal(R_constant* C) { return equal(*C); } + + BOOL equal(R_constant* C) { return equal(*C); } }; typedef resptr_core> ref_constant; diff --git a/src/Layers/xrRender/r_sun_cascades.h b/src/Layers/xrRender/r_sun_cascades.h index 6ae5226ebd8..e2542f5495c 100644 --- a/src/Layers/xrRender/r_sun_cascades.h +++ b/src/Layers/xrRender/r_sun_cascades.h @@ -5,7 +5,7 @@ namespace sun struct ray { ray() {} - ray(Fvector3 const& _P, Fvector3 const& _D) : P(_P), D(_D) {} + ray(Fvector3 const& _P, Fvector3 const& _D) : D(_D), P(_P) {} Fvector3 D; Fvector3 P; }; diff --git a/src/Layers/xrRender/stats_manager.cpp b/src/Layers/xrRender/stats_manager.cpp index 60f37ed05ad..d210c203d1f 100644 --- a/src/Layers/xrRender/stats_manager.cpp +++ b/src/Layers/xrRender/stats_manager.cpp @@ -95,7 +95,7 @@ void stats_manager::increment_stats_ib(ID3DIndexBuffer* buff) void stats_manager::decrement_stats_rtarget(ID3DTexture2D* buff) { - if (buff == NULL || g_dedicated_server) + if (buff == nullptr || g_dedicated_server) return; buff->AddRef(); @@ -119,7 +119,7 @@ void stats_manager::decrement_stats_rtarget(ID3DTexture2D* buff) void stats_manager::decrement_stats_vb(ID3DVertexBuffer* buff) { - if (buff == NULL || g_dedicated_server) + if (buff == nullptr || g_dedicated_server) return; buff->AddRef(); @@ -140,7 +140,7 @@ void stats_manager::decrement_stats_vb(ID3DVertexBuffer* buff) void stats_manager::decrement_stats_ib(ID3DIndexBuffer* buff) { - if (buff == NULL || g_dedicated_server) + if (buff == nullptr || g_dedicated_server) return; buff->AddRef(); @@ -171,7 +171,7 @@ void stats_manager::decrement_stats(u32 size, enum_stats_buffer_type type, _D3DP void stats_manager::decrement_stats(u32 size, enum_stats_buffer_type type, _D3DPOOL location, void* buff_ptr) { - if (buff_ptr == 0 || g_dedicated_server) + if (buff_ptr == nullptr || g_dedicated_server) return; #ifdef DEBUG diff --git a/src/Layers/xrRender/tss.h b/src/Layers/xrRender/tss.h index 17cf85aa61a..7331939de1e 100644 --- a/src/Layers/xrRender/tss.h +++ b/src/Layers/xrRender/tss.h @@ -21,8 +21,9 @@ enum XRDX10RENDERSTATETYPE class CSimulatorTSS { public: - IC void Set(SimulatorStates& container, u32 S, u32 N, u32 V) { container.set_TSS(S, N, V); } - IC void SetColor(SimulatorStates& container, u32 S, u32 A1, u32 OP, u32 A2) + void Set(SimulatorStates& container, u32 S, u32 N, u32 V) { container.set_TSS(S, N, V); } + + void SetColor(SimulatorStates& container, u32 S, u32 A1, u32 OP, u32 A2) { Set(container, S, D3DTSS_COLOROP, OP); switch (OP) @@ -36,12 +37,14 @@ class CSimulatorTSS break; } } - IC void SetColor3(SimulatorStates& container, u32 S, u32 A1, u32 OP, u32 A2, u32 A3) + + void SetColor3(SimulatorStates& container, u32 S, u32 A1, u32 OP, u32 A2, u32 A3) { SetColor(container, S, A1, OP, A2); Set(container, S, D3DTSS_COLORARG0, A3); } - IC void SetAlpha(SimulatorStates& container, u32 S, u32 A1, u32 OP, u32 A2) + + void SetAlpha(SimulatorStates& container, u32 S, u32 A1, u32 OP, u32 A2) { Set(container, S, D3DTSS_ALPHAOP, OP); switch (OP) @@ -55,7 +58,8 @@ class CSimulatorTSS break; } } - IC void SetAlpha3(SimulatorStates& container, u32 S, u32 A1, u32 OP, u32 A2, u32 A3) + + void SetAlpha3(SimulatorStates& container, u32 S, u32 A1, u32 OP, u32 A2, u32 A3) { SetAlpha(container, S, A1, OP, A2); Set(container, S, D3DTSS_ALPHAARG0, A3); @@ -65,7 +69,7 @@ class CSimulatorTSS class CSimulatorRS { public: - IC void Set(SimulatorStates& container, u32 N, u32 V) + void Set(SimulatorStates& container, u32 N, u32 V) { // Igor: XBox has render states 400 and hire // R_ASSERT(N<256); @@ -82,15 +86,15 @@ class CSimulator public: CSimulator() { Invalidate(); } - IC void Invalidate() { container.clear(); } - IC void SetTSS(u32 S, u32 N, u32 V) { TSS.Set(container, S, N, V); } - IC void SetSAMP(u32 S, u32 N, u32 V) { container.set_SAMP(S, N, V); } - IC void SetColor(u32 S, u32 a, u32 b, u32 c) { TSS.SetColor(container, S, a, b, c); } - IC void SetColor3(u32 S, u32 a, u32 b, u32 c, u32 d) { TSS.SetColor3(container, S, a, b, c, d); } - IC void SetAlpha(u32 S, u32 a, u32 b, u32 c) { TSS.SetAlpha(container, S, a, b, c); } - IC void SetAlpha3(u32 S, u32 a, u32 b, u32 c, u32 d) { TSS.SetAlpha3(container, S, a, b, c, d); } - IC void SetRS(u32 N, u32 V) { RS.Set(container, N, V); } - IC SimulatorStates& GetContainer() { return container; } + void Invalidate() { container.clear(); } + void SetTSS(u32 S, u32 N, u32 V) { TSS.Set(container, S, N, V); } + void SetSAMP(u32 S, u32 N, u32 V) { container.set_SAMP(S, N, V); } + void SetColor(u32 S, u32 a, u32 b, u32 c) { TSS.SetColor(container, S, a, b, c); } + void SetColor3(u32 S, u32 a, u32 b, u32 c, u32 d) { TSS.SetColor3(container, S, a, b, c, d); } + void SetAlpha(u32 S, u32 a, u32 b, u32 c) { TSS.SetAlpha(container, S, a, b, c); } + void SetAlpha3(u32 S, u32 a, u32 b, u32 c, u32 d) { TSS.SetAlpha3(container, S, a, b, c, d); } + void SetRS(u32 N, u32 V) { RS.Set(container, N, V); } + SimulatorStates& GetContainer() { return container; } }; #endif diff --git a/src/Layers/xrRender/tss_def.cpp b/src/Layers/xrRender/tss_def.cpp index a5c6d9934c6..ec8f1adb292 100644 --- a/src/Layers/xrRender/tss_def.cpp +++ b/src/Layers/xrRender/tss_def.cpp @@ -26,7 +26,7 @@ IDirect3DStateBlock9* SimulatorStates::record() break; } } - IDirect3DStateBlock9* SB = 0; + IDirect3DStateBlock9* SB = nullptr; CHK_DX(HW.pDevice->EndStateBlock(&SB)); return SB; #endif // USE_DX10 diff --git a/src/Layers/xrRender/tss_def.h b/src/Layers/xrRender/tss_def.h index d6c2836afa9..f3174d77b05 100644 --- a/src/Layers/xrRender/tss_def.h +++ b/src/Layers/xrRender/tss_def.h @@ -11,21 +11,23 @@ class SimulatorStates u32 type; // 0=RS, 1=TSS u32 v1, v2, v3; - IC void set_RS(u32 a, u32 b) + void set_RS(u32 a, u32 b) { type = 0; v1 = a; v2 = b; v3 = 0; } - IC void set_TSS(u32 a, u32 b, u32 c) + + void set_TSS(u32 a, u32 b, u32 c) { type = 1; v1 = a; v2 = b; v3 = c; } - IC void set_SAMP(u32 a, u32 b, u32 c) + + void set_SAMP(u32 a, u32 b, u32 c) { type = 2; v1 = a; diff --git a/src/Layers/xrRender/xrRender_console.cpp b/src/Layers/xrRender/xrRender_console.cpp index a45f2ac29f0..96adbbf6fdf 100644 --- a/src/Layers/xrRender/xrRender_console.cpp +++ b/src/Layers/xrRender/xrRender_console.cpp @@ -4,39 +4,39 @@ #include "xrRender_console.h" u32 ps_Preset = 2; -xr_token qpreset_token[] = {{"Minimum", 0}, {"Low", 1}, {"Default", 2}, {"High", 3}, {"Extreme", 4}, {0, 0}}; +xr_token qpreset_token[] = {{"Minimum", 0}, {"Low", 1}, {"Default", 2}, {"High", 3}, {"Extreme", 4}, {nullptr, 0}}; u32 ps_r_ssao_mode = 2; -xr_token qssao_mode_token[] = {{"disabled", 0}, {"default", 1}, {"hdao", 2}, {"hbao", 3}, {0, 0}}; +xr_token qssao_mode_token[] = {{"disabled", 0}, {"default", 1}, {"hdao", 2}, {"hbao", 3}, {nullptr, 0}}; u32 ps_r_sun_shafts = 2; -xr_token qsun_shafts_token[] = {{"st_opt_off", 0}, {"st_opt_low", 1}, {"st_opt_medium", 2}, {"st_opt_high", 3}, {0, 0}}; +xr_token qsun_shafts_token[] = {{"st_opt_off", 0}, {"st_opt_low", 1}, {"st_opt_medium", 2}, {"st_opt_high", 3}, {nullptr, 0}}; u32 ps_r_ssao = 3; xr_token qssao_token[] = {{"st_opt_off", 0}, {"st_opt_low", 1}, {"st_opt_medium", 2}, {"st_opt_high", 3}, #if defined(USE_DX10) || defined(USE_DX11) {"st_opt_ultra", 4}, #endif - {0, 0}}; + {nullptr, 0}}; u32 ps_r_sun_quality = 1; // = 0; xr_token qsun_quality_token[] = {{"st_opt_low", 0}, {"st_opt_medium", 1}, {"st_opt_high", 2}, #if defined(USE_DX10) || defined(USE_DX11) {"st_opt_ultra", 3}, {"st_opt_extreme", 4}, #endif // USE_DX10 - {0, 0}}; + {nullptr, 0}}; u32 ps_r3_msaa = 0; // = 0; xr_token qmsaa_token[] = {{"st_opt_off", 0}, {"2x", 1}, {"4x", 2}, //{"8x", 3}, - {0, 0}}; + {nullptr, 0}}; u32 ps_r3_msaa_atest = 0; // = 0; xr_token qmsaa__atest_token[] = { - {"st_opt_off", 0}, {"st_opt_atest_msaa_dx10_0", 1}, {"st_opt_atest_msaa_dx10_1", 2}, {0, 0}}; + {"st_opt_off", 0}, {"st_opt_atest_msaa_dx10_0", 1}, {"st_opt_atest_msaa_dx10_1", 2}, {nullptr, 0}}; u32 ps_r3_minmax_sm = 3; // = 0; -xr_token qminmax_sm_token[] = {{"off", 0}, {"on", 1}, {"auto", 2}, {"autodetect", 3}, {0, 0}}; +xr_token qminmax_sm_token[] = {{"off", 0}, {"on", 1}, {"auto", 2}, {"autodetect", 3}, {nullptr, 0}}; // “Off” // “DX10.0 style [Standard]” @@ -184,7 +184,7 @@ class CCC_tf_Aniso : public CCC_Integer public: void apply() { - if (0 == HW.pDevice) + if (nullptr == HW.pDevice) return; int val = *value; clamp(val, 1, 16); @@ -212,7 +212,7 @@ class CCC_tf_MipBias : public CCC_Float public: void apply() { - if (0 == HW.pDevice) + if (nullptr == HW.pDevice) return; #if defined(USE_DX10) || defined(USE_DX11) diff --git a/src/Layers/xrRender/xr_effgamma.h b/src/Layers/xrRender/xr_effgamma.h index 480ddbc6b54..37f712fef63 100644 --- a/src/Layers/xrRender/xr_effgamma.h +++ b/src/Layers/xrRender/xr_effgamma.h @@ -19,11 +19,11 @@ class CGammaControl Balance(1.f, 1.f, 1.f); }; - IC void Balance(float _r, float _g, float _b) { cBalance.set(_r, _g, _b, 1); } - IC void Balance(Fcolor& C) { Balance(C.r, C.g, C.b); } - IC void Gamma(float G) { fGamma = G; } - IC void Brightness(float B) { fBrightness = B; } - IC void Contrast(float C) { fContrast = C; } + void Balance(float _r, float _g, float _b) { cBalance.set(_r, _g, _b, 1); } + void Balance(Fcolor& C) { Balance(C.r, C.g, C.b); } + void Gamma(float G) { fGamma = G; } + void Brightness(float B) { fBrightness = B; } + void Contrast(float C) { fContrast = C; } void GetIP(float& G, float& B, float& C, Fcolor& Balance) { G = fGamma; diff --git a/src/Layers/xrRenderDX9/dx9R_Backend_Runtime.h b/src/Layers/xrRenderDX9/dx9R_Backend_Runtime.h index 358afdc75e3..a323291feac 100644 --- a/src/Layers/xrRenderDX9/dx9R_Backend_Runtime.h +++ b/src/Layers/xrRenderDX9/dx9R_Backend_Runtime.h @@ -253,7 +253,7 @@ IC void CBackend::set_Constants(R_constant_table* C) xforms.unmap(); hemi.unmap(); tree.unmap(); - if (0 == C) + if (nullptr == C) return; PGO(Msg("PGO:c-table")); diff --git a/src/Layers/xrRenderPC_R1/Blender_Model.cpp b/src/Layers/xrRenderPC_R1/Blender_Model.cpp index e637cdc4322..cff032a07e1 100644 --- a/src/Layers/xrRenderPC_R1/Blender_Model.cpp +++ b/src/Layers/xrRenderPC_R1/Blender_Model.cpp @@ -88,8 +88,8 @@ void CBlender_Model::Compile(CBlender_Compile& C) } else { - LPCSTR vsname = 0; - LPCSTR psname = 0; + LPCSTR vsname = nullptr; + LPCSTR psname = nullptr; switch (C.iElement) { case SE_R1_NORMAL_HQ: diff --git a/src/Layers/xrRenderPC_R1/FStaticRender.cpp b/src/Layers/xrRenderPC_R1/FStaticRender.cpp index 7d8a9c4c77c..e567ab4dfee 100644 --- a/src/Layers/xrRenderPC_R1/FStaticRender.cpp +++ b/src/Layers/xrRenderPC_R1/FStaticRender.cpp @@ -36,7 +36,7 @@ ShaderElement* CRender::rimp_select_sh_dynamic(dxRender_Visual* pVisual, float / default: NODEFAULT; } #ifdef DEBUG - return 0; + return nullptr; #endif } ////////////////////////////////////////////////////////////////////////// @@ -53,16 +53,16 @@ ShaderElement* CRender::rimp_select_sh_static(dxRender_Visual* pVisual, float cd default: NODEFAULT; } #ifdef DEBUG - return 0; + return nullptr; #endif } ////////////////////////////////////////////////////////////////////////// void CRender::create() { - L_DB = 0; - L_Shadows = 0; - L_Projector = 0; + L_DB = nullptr; + L_Shadows = nullptr; + L_Projector = nullptr; Device.seqFrame.Add(this, REG_PRIORITY_HIGH + 0x12345678); @@ -161,7 +161,7 @@ void CRender::model_Delete(IRenderVisual*& V, BOOL bDiscard) { dxRender_Visual* pVisual = (dxRender_Visual*)V; Models->Delete(pVisual, bDiscard); - V = 0; + V = nullptr; } IRender_DetailModel* CRender::model_CreateDM(IReader* F) { @@ -176,7 +176,7 @@ void CRender::model_Delete(IRender_DetailModel*& F) CDetail* D = (CDetail*)F; D->Unload(); xr_delete(D); - F = NULL; + F = nullptr; } } IRenderVisual* CRender::model_CreatePE(LPCSTR name) @@ -328,15 +328,15 @@ void CRender::set_Object(IRenderable* O) else { if (L_Shadows) - L_Shadows->set_object(0); + L_Shadows->set_object(nullptr); if (L_Projector) - L_Projector->set_object(0); + L_Projector->set_object(nullptr); } } void CRender::apply_object(IRenderable* O) { - if (0 == O) + if (nullptr == O) return; if (PHASE_NORMAL == phase && O->renderable_ROS()) { @@ -408,7 +408,7 @@ void CRender::Calculate() // Frustum & HOM rendering ViewBase.CreateFromMatrix(Device.mFullTransform, FRUSTUM_P_LRTB | FRUSTUM_P_FAR); - View = 0; + View = nullptr; HOM.Enable(); HOM.Render(ViewBase); gm_SetNearer(FALSE); @@ -421,7 +421,7 @@ void CRender::Calculate() if (pSector && (pSector != pLastSector)) g_pGamePersistent->OnSectorChanged(translateSector(pSector)); - if (0 == pSector) + if (nullptr == pSector) pSector = pLastSector; pLastSector = pSector; vLastCameraPos.set(Device.vCameraPosition); @@ -477,7 +477,7 @@ void CRender::Calculate() std::sort(lstRenderables.begin(), lstRenderables.end(), pred_sp_sort); // Determine visibility for dynamic part of scene - set_Object(0); + set_Object(nullptr); g_hud->Render_First(); // R1 shadows g_hud->Render_Last(); u32 uID_LTRACK = 0xffffffff; @@ -501,7 +501,7 @@ void CRender::Calculate() ISpatial* spatial = lstRenderables[o_it]; spatial->spatial_updatesector(); CSector* sector = (CSector*)spatial->GetSpatialData().sector; - if (0 == sector) + if (nullptr == sector) continue; // disassociated from S/P structure // Filter only not light spatial @@ -519,7 +519,7 @@ void CRender::Calculate() continue; // renderable IRenderable* renderable = spatial->dcast_Renderable(); - if (0 == renderable) + if (nullptr == renderable) { // It may be an glow CGlow* glow = dynamic_cast(spatial); @@ -555,7 +555,7 @@ void CRender::Calculate() } set_Object(renderable); renderable->renderable_Render(); - set_Object(0); //? is it needed at all + set_Object(nullptr); //? is it needed at all } break; // exit loop on frustums } @@ -590,7 +590,7 @@ void CRender::Calculate() } else { - set_Object(0); + set_Object(nullptr); } // End calc @@ -757,11 +757,11 @@ class includer : public ID3DXInclude string_path pname; strconcat(sizeof(pname), pname, GlobalEnv.Render->getShaderPath(), pFileName); IReader* R = FS.r_open("$game_shaders$", pname); - if (0 == R) + if (nullptr == R) { // possibly in shared directory or somewhere else - open directly R = FS.r_open("$game_shaders$", pFileName); - if (0 == R) + if (nullptr == R) return E_FAIL; } @@ -798,8 +798,8 @@ static HRESULT create_shader(LPCSTR const pTarget, DWORD const* buffer, u32 cons return E_FAIL; } - LPCVOID data = NULL; - _result = D3DXFindShaderComment(buffer, MAKEFOURCC('C', 'T', 'A', 'B'), &data, NULL); + LPCVOID data = nullptr; + _result = D3DXFindShaderComment(buffer, MAKEFOURCC('C', 'T', 'A', 'B'), &data, nullptr); if (SUCCEEDED(_result) && data) { LPD3DXSHADER_CONSTANTTABLE pConstants = LPD3DXSHADER_CONSTANTTABLE(data); @@ -822,8 +822,8 @@ static HRESULT create_shader(LPCSTR const pTarget, DWORD const* buffer, u32 cons return E_FAIL; } - LPCVOID data = NULL; - _result = D3DXFindShaderComment(buffer, MAKEFOURCC('C', 'T', 'A', 'B'), &data, NULL); + LPCVOID data = nullptr; + _result = D3DXFindShaderComment(buffer, MAKEFOURCC('C', 'T', 'A', 'B'), &data, nullptr); if (SUCCEEDED(_result) && data) { LPD3DXSHADER_CONSTANTTABLE pConstants = LPD3DXSHADER_CONSTANTTABLE(data); @@ -838,8 +838,8 @@ static HRESULT create_shader(LPCSTR const pTarget, DWORD const* buffer, u32 cons if (disasm) { - ID3DXBuffer* disasm = 0; - D3DXDisassembleShader(LPDWORD(buffer), FALSE, 0, &disasm); + ID3DXBuffer* disasm = nullptr; + D3DXDisassembleShader(LPDWORD(buffer), FALSE, nullptr, &disasm); string_path dname; strconcat(sizeof(dname), dname, "disasm\\", file_name, ('v' == pTarget[0]) ? ".vs" : ".ps"); IWriter* W = FS.w_open("$logs$", dname); @@ -930,8 +930,8 @@ HRESULT CRender::shader_compile(LPCSTR name, DWORD const* pSrcData, UINT SrcData ++len; // finish - defines[def_it].Name = 0; - defines[def_it].Definition = 0; + defines[def_it].Name = nullptr; + defines[def_it].Definition = nullptr; def_it++; R_ASSERT(def_it < 128); @@ -986,9 +986,9 @@ HRESULT CRender::shader_compile(LPCSTR name, DWORD const* pSrcData, UINT SrcData if (FAILED(_result)) { includer Includer; - LPD3DXBUFFER pShaderBuf = NULL; - LPD3DXBUFFER pErrorBuf = NULL; - LPD3DXCONSTANTTABLE pConstants = NULL; + LPD3DXBUFFER pShaderBuf = nullptr; + LPD3DXBUFFER pErrorBuf = nullptr; + LPD3DXCONSTANTTABLE pConstants = nullptr; LPD3DXINCLUDE pInclude = (LPD3DXINCLUDE)&Includer; _result = D3DXCompileShader((LPCSTR)pSrcData, SrcDataLen, defines, pInclude, pFunctionName, pTarget, diff --git a/src/Layers/xrRenderPC_R1/FStaticRender.h b/src/Layers/xrRenderPC_R1/FStaticRender.h index 222b0b5109d..7ab5d860ae3 100644 --- a/src/Layers/xrRenderPC_R1/FStaticRender.h +++ b/src/Layers/xrRenderPC_R1/FStaticRender.h @@ -100,7 +100,7 @@ class CRender : public D3DXRenderBase IRenderVisual* model_CreatePE(LPCSTR name); void ApplyBlur4(FVF::TL4uv* dest, u32 w, u32 h, float k); void apply_object(IRenderable* O); - IC void apply_lmaterial(){}; + void apply_lmaterial(){}; public: // feature level diff --git a/src/Layers/xrRenderPC_R1/FStaticRender_Blenders.cpp b/src/Layers/xrRenderPC_R1/FStaticRender_Blenders.cpp index de56a6c1fe5..067569fbe61 100644 --- a/src/Layers/xrRenderPC_R1/FStaticRender_Blenders.cpp +++ b/src/Layers/xrRenderPC_R1/FStaticRender_Blenders.cpp @@ -41,7 +41,7 @@ IBlender* CRender::blender_create(CLASS_ID cls) case B_TREE: return new CBlender_Tree(); case B_PARTICLE: return new CBlender_Particle(); } - return 0; + return nullptr; } void CRender::blender_destroy(IBlender*& B) { xr_delete(B); } diff --git a/src/Layers/xrRenderPC_R1/FStaticRender_DetectSector.cpp b/src/Layers/xrRenderPC_R1/FStaticRender_DetectSector.cpp index 8b9f2b46cd7..f7209c51d84 100644 --- a/src/Layers/xrRenderPC_R1/FStaticRender_DetectSector.cpp +++ b/src/Layers/xrRenderPC_R1/FStaticRender_DetectSector.cpp @@ -62,7 +62,7 @@ IRender_Sector* CRender::detectSector(const Fvector& P) else if (id2 >= 0) ID = id2; // only id2 found else - return 0; + return nullptr; if (ID == id1) { diff --git a/src/Layers/xrRenderPC_R1/FStaticRender_Loader.cpp b/src/Layers/xrRenderPC_R1/FStaticRender_Loader.cpp index b08177111c8..b3ba31c838a 100644 --- a/src/Layers/xrRenderPC_R1/FStaticRender_Loader.cpp +++ b/src/Layers/xrRenderPC_R1/FStaticRender_Loader.cpp @@ -13,7 +13,7 @@ void CRender::level_Load(IReader* fs) { - R_ASSERT(0 != g_pGameLevel); + R_ASSERT(nullptr != g_pGameLevel); R_ASSERT(!b_loaded); // Begin @@ -101,7 +101,7 @@ void CRender::level_Load(IReader* fs) void CRender::level_Unload() { - if (0 == g_pGameLevel) + if (nullptr == g_pGameLevel) return; if (!b_loaded) return; @@ -117,7 +117,7 @@ void CRender::level_Unload() //*** Sectors // 1. xr_delete(rmPortals); - pLastSector = 0; + pLastSector = nullptr; vLastCameraPos.set(flt_max, flt_max, flt_max); uLastLTRACK = 0; @@ -212,8 +212,8 @@ void CRender::LoadBuffers(CStreamReader* base_fs) Msg("* [Loading VB] %d verts, %d Kb", vCount, (vCount * vSize) / 1024); // Create and fill - BYTE* pData = 0; - R_CHK(HW.pDevice->CreateVertexBuffer(vCount * vSize, dwUsage, 0, D3DPOOL_MANAGED, &VB[i], 0)); + BYTE* pData = nullptr; + R_CHK(HW.pDevice->CreateVertexBuffer(vCount * vSize, dwUsage, 0, D3DPOOL_MANAGED, &VB[i], nullptr)); HW.stats_manager.increment_stats(vCount * vSize, enum_stats_buffer_type_vertex, D3DPOOL_MANAGED); R_CHK(VB[i]->Lock(0, 0, (void**)&pData, 0)); fs->r(pData, vCount * vSize); @@ -241,8 +241,8 @@ void CRender::LoadBuffers(CStreamReader* base_fs) Msg("* [Loading IB] %d indices, %d Kb", iCount, (iCount * 2) / 1024); // Create and fill - BYTE* pData = 0; - R_CHK(HW.pDevice->CreateIndexBuffer(iCount * 2, dwUsage, D3DFMT_INDEX16, D3DPOOL_MANAGED, &IB[i], 0)); + BYTE* pData = nullptr; + R_CHK(HW.pDevice->CreateIndexBuffer(iCount * 2, dwUsage, D3DFMT_INDEX16, D3DPOOL_MANAGED, &IB[i], nullptr)); HW.stats_manager.increment_stats(iCount * 2, enum_stats_buffer_type_index, D3DPOOL_MANAGED); R_CHK(IB[i]->Lock(0, 0, (void**)&pData, 0)); // CopyMemory (pData,fs->pointer(),iCount*2); @@ -257,16 +257,16 @@ void CRender::LoadBuffers(CStreamReader* base_fs) void CRender::LoadVisuals(IReader* fs) { - IReader* chunk = 0; + IReader* chunk = nullptr; u32 index = 0; - dxRender_Visual* V = 0; + dxRender_Visual* V = nullptr; ogf_header H; - while ((chunk = fs->open_chunk(index)) != 0) + while ((chunk = fs->open_chunk(index)) != nullptr) { chunk->r_chunk_safe(OGF_HEADER, &H, sizeof(H)); V = Models->Instance_Create(H.type); - V->Load(0, chunk, 0); + V->Load(nullptr, chunk, 0); Visuals.push_back(V); chunk->close(); @@ -308,7 +308,7 @@ void CRender::LoadSectors(IReader* fs) for (u32 i = 0;; i++) { IReader* P = S->open_chunk(i); - if (0 == P) + if (nullptr == P) break; CSector* __S = new CSector(); @@ -350,14 +350,14 @@ void CRender::LoadSectors(IReader* fs) } else { - rmPortals = 0; + rmPortals = nullptr; } // debug // for (int d=0; dDebugDump (); - pLastSector = 0; + pLastSector = nullptr; } void CRender::LoadSWIs(CStreamReader* base_fs) diff --git a/src/Layers/xrRenderPC_R1/FStaticRender_RenderTarget.cpp b/src/Layers/xrRenderPC_R1/FStaticRender_RenderTarget.cpp index 946e76b5629..d0343769db6 100644 --- a/src/Layers/xrRenderPC_R1/FStaticRender_RenderTarget.cpp +++ b/src/Layers/xrRenderPC_R1/FStaticRender_RenderTarget.cpp @@ -9,11 +9,11 @@ static LPCSTR RTname_distort = "$user$distort"; CRenderTarget::CRenderTarget() { bAvailable = FALSE; - RT = 0; - RT_color_map = 0; - pTempZB = 0; - ZB = 0; - pFB = 0; + RT = nullptr; + RT_color_map = nullptr; + pTempZB = nullptr; + ZB = nullptr; + pFB = nullptr; param_blur = 0.f; param_gray = 0.f; @@ -84,7 +84,7 @@ BOOL CRenderTarget::Create() //u32 w = Device.dwWidth, h = Device.dwHeight; //HW.pDevice->CreateOffscreenPlainSurface( // Device.dwWidth, Device.dwHeight, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &pFB, NULL); - HW.pDevice->CreateOffscreenPlainSurface(rtWidth, rtHeight, HW.Caps.fTarget, D3DPOOL_SYSTEMMEM, &pFB, NULL); + HW.pDevice->CreateOffscreenPlainSurface(rtWidth, rtHeight, HW.Caps.fTarget, D3DPOOL_SYSTEMMEM, &pFB, nullptr); // Shaders and stream s_postprocess[0].create("postprocess"); @@ -272,7 +272,8 @@ struct TL_2c3uv u32 color0; u32 color1; Fvector2 uv[3]; - IC void set(float x, float y, u32 c0, u32 c1, float u0, float v0, float u1, float v1, float u2, float v2) + + void set(float x, float y, u32 c0, u32 c1, float u0, float v0, float u1, float v1, float u2, float v2) { p.set(x, y, EPS_S, 1.f); color0 = c0; diff --git a/src/Layers/xrRenderPC_R1/LightPPA.cpp b/src/Layers/xrRenderPC_R1/LightPPA.cpp index fb9477838ab..fe23c5e7bc5 100644 --- a/src/Layers/xrRenderPC_R1/LightPPA.cpp +++ b/src/Layers/xrRenderPC_R1/LightPPA.cpp @@ -208,7 +208,7 @@ void CLightR_Manager::render_point(u32 _priority) bHUD = F.testSphere_dirty(Device.vCameraPosition, 2.f); // 5. Dump sorting tree - RCache.set_Constants((R_constant_table*)0); + RCache.set_Constants((R_constant_table*)nullptr); if (bHUD && _priority == 0) g_hud->Render_Last(); RImplementation.r_dsgraph_render_graph(_priority); @@ -288,7 +288,7 @@ void CLightR_Manager::render_spot(u32 _priority) // 4. Dump sorting tree //RCache.set_ClipPlanes(true, &L_combine); - RCache.set_Constants((R_constant_table*)0); + RCache.set_Constants((R_constant_table*)nullptr); if (bHUD && _priority == 0) g_hud->Render_Last(); RImplementation.r_dsgraph_render_graph(_priority); @@ -323,7 +323,7 @@ void CLightR_Manager::add(light* L) { if (L->range < 0.1f) return; - if (0 == L->spatial.sector) + if (nullptr == L->spatial.sector) return; if (IRender_Light::POINT == L->flags.type) { diff --git a/src/Layers/xrRenderPC_R1/LightProjector.cpp b/src/Layers/xrRenderPC_R1/LightProjector.cpp index 10281619e1e..1e8b0c67a32 100644 --- a/src/Layers/xrRenderPC_R1/LightProjector.cpp +++ b/src/Layers/xrRenderPC_R1/LightProjector.cpp @@ -31,8 +31,8 @@ float clipD(float R) { return P_distance * (R / P_ideal_size); } CLightProjector::CLightProjector() { - current = 0; - RT = 0; + current = nullptr; + RT = nullptr; // RT.create("$user$projector", P_rt_size, P_rt_size, P_rtf); @@ -54,14 +54,14 @@ CLightProjector::~CLightProjector() void CLightProjector::set_object(IRenderable* O) { - if ((0 == O) || (receivers.size() >= P_o_count)) - current = 0; + if ((nullptr == O) || (receivers.size() >= P_o_count)) + current = nullptr; else { if (!O->renderable_ShadowReceive() || RImplementation.val_bInvisible || ((CROS_impl*)O->renderable_ROS())->shadow_recv_frame == Device.dwFrame) { - current = 0; + current = nullptr; return; } @@ -74,22 +74,22 @@ void CLightProjector::set_object(IRenderable* O) if (D < clipD(R)) current = O; else - current = 0; + current = nullptr; if (current) { ISpatial* spatial = dynamic_cast(O); - if (0 == spatial) - current = 0; + if (nullptr == spatial) + current = nullptr; else { spatial->spatial_updatesector(); - if (0 == spatial->GetSpatialData().sector) + if (nullptr == spatial->GetSpatialData().sector) { IGameObject* obj = dynamic_cast(O); if (obj) Msg("! Invalid object '%s' position. Outside of sector structure.", obj->cName().c_str()); - current = 0; + current = nullptr; } } } @@ -183,7 +183,7 @@ void CLightProjector::calculate() // Begin RCache.set_RT(RT->pRT); RCache.set_ZB(RImplementation.Target->pTempZB); - CHK_DX(HW.pDevice->Clear(0, 0, D3DCLEAR_ZBUFFER | (HW.Caps.bStencil ? D3DCLEAR_STENCIL : 0), 0, 1, 0)); + CHK_DX(HW.pDevice->Clear(0, nullptr, D3DCLEAR_ZBUFFER | (HW.Caps.bStencil ? D3DCLEAR_STENCIL : 0), 0, 1, 0)); RCache.set_xform_world(Fidentity); // reallocate/reassociate structures + perform all the work @@ -292,7 +292,7 @@ void CLightProjector::calculate() // Clear color to ambience Fvector& cap = LT->get_approximate(); CHK_DX(HW.pDevice->Clear( - 0, 0, D3DCLEAR_TARGET, color_rgba_f(cap.x, cap.y, cap.z, (cap.x + cap.y + cap.z) / 4.f), 1, 0)); + 0, nullptr, D3DCLEAR_TARGET, color_rgba_f(cap.x, cap.y, cap.z, (cap.x + cap.y + cap.z) / 4.f), 1, 0)); // calculate uv-gen matrix and clamper Fmatrix mCombine; diff --git a/src/Layers/xrRenderPC_R1/LightProjector.h b/src/Layers/xrRenderPC_R1/LightProjector.h index 53143c44d82..760810d989b 100644 --- a/src/Layers/xrRenderPC_R1/LightProjector.h +++ b/src/Layers/xrRenderPC_R1/LightProjector.h @@ -43,7 +43,7 @@ class CLightProjector : public pureAppActivate public: void set_object(IRenderable* O); - BOOL shadowing() { return current != 0; } + BOOL shadowing() { return current != nullptr; } void calculate(); void setup(int slot); void finalize() diff --git a/src/Layers/xrRenderPC_R1/LightShadows.cpp b/src/Layers/xrRenderPC_R1/LightShadows.cpp index b6a50cd9156..a191a9ec413 100644 --- a/src/Layers/xrRenderPC_R1/LightShadows.cpp +++ b/src/Layers/xrRenderPC_R1/LightShadows.cpp @@ -34,8 +34,8 @@ const u32 cache_old = 30 * 1000; // 30 secs // XXX: add to statistics CLightShadows::CLightShadows() : xrc("LightShadows") { - current = 0; - RT = 0; + current = nullptr; + RT = nullptr; LPCSTR RTname = "$user$shadow"; LPCSTR RTtemp = "$user$temp"; @@ -48,7 +48,7 @@ CLightShadows::CLightShadows() : xrc("LightShadows") RT.create(RTname, S_rt_size, S_rt_size, S_rtf); RT_temp.create(RTtemp, S_rt_size, S_rt_size, S_rtf); sh_World.create("effects\\shadow_world", RTname); - geom_World.create(FVF::F_LIT, RCache.Vertex.Buffer(), NULL); + geom_World.create(FVF::F_LIT, RCache.Vertex.Buffer(), nullptr); sh_BlurTR.create("blur4", RTtemp2); sh_BlurRT.create("blur4", RTname2); geom_Blur.create(FVF::F_TL4uv, RCache.Vertex.Buffer(), RCache.QuadIB); @@ -86,14 +86,14 @@ CLightShadows::~CLightShadows() void CLightShadows::set_object(IRenderable* O) { - if (0 == O) - current = 0; + if (nullptr == O) + current = nullptr; else { if (!O->renderable_ShadowGenerate() || RImplementation.val_bHUD || ((CROS_impl*)O->renderable_ROS())->shadow_gen_frame == Device.dwFrame) { - current = 0; + current = nullptr; return; } @@ -108,14 +108,14 @@ void CLightShadows::set_object(IRenderable* O) if (_priority < 1.f) current = O; else - current = 0; + current = nullptr; if (current) { ((CROS_impl*)O->renderable_ROS())->shadow_gen_frame = Device.dwFrame; // alloc - caster* cs = NULL; + caster* cs = nullptr; if (casters_pool.empty()) cs = new caster(); else @@ -136,10 +136,10 @@ void CLightShadows::set_object(IRenderable* O) void CLightShadows::add_element(NODE& N) { - if (0 == current) + if (nullptr == current) return; VERIFY2(casters.back()->nodes.size() < 24, "Object exceeds limit of 24 renderable parts/materials"); - if (0 == N.pVisual->shader->E[SE_R1_LMODELS]._get()) + if (nullptr == N.pVisual->shader->E[SE_R1_LMODELS]._get()) return; casters.back()->nodes.push_back(N); } @@ -187,7 +187,7 @@ void CLightShadows::calculate() bRTS = TRUE; RCache.set_RT(RT_temp->pRT); RCache.set_ZB(RImplementation.Target->pTempZB); - HW.pDevice->Clear(0, 0, D3DCLEAR_TARGET, color_xrgb(255, 255, 255), 1, 0); + HW.pDevice->Clear(0, nullptr, D3DCLEAR_TARGET, color_xrgb(255, 255, 255), 1, 0); } // calculate light center @@ -443,12 +443,12 @@ void CLightShadows::render() t_offset.y += .5f / S_rt_size; // Search the cache - cache_item* CI = 0; + cache_item* CI = nullptr; BOOL bValid = FALSE; cache_item CI_what; CI_what.O = S.O; CI_what.L = S.L; - CI_what.tris = 0; + CI_what.tris = nullptr; xr_vector::iterator CI_ptr = std::lower_bound(cache.begin(), cache.end(), CI_what, cache_search); if (CI_ptr == cache.end()) { // empty ? @@ -521,7 +521,7 @@ void CLightShadows::render() // Clip polygon sPoly* clip = F.ClipPoly(A, B); - if (0 == clip) + if (nullptr == clip) continue; // Triangulate poly @@ -544,7 +544,7 @@ void CLightShadows::render() CI->tcnt = tess.size(); // Msg ("---free--- %x",u32(CI->tris)); xr_free(CI->tris); - VERIFY(0 == CI->tris); + VERIFY(nullptr == CI->tris); if (tess.size()) { CI->tris = xr_alloc(CI->tcnt); @@ -619,7 +619,7 @@ void CLightShadows::render() { // Msg ("---free--- %x",u32(ci.tris)); xr_free(ci.tris); - VERIFY(0 == ci.tris); + VERIFY(nullptr == ci.tris); cache.erase(cache.begin() + cit); cit--; } diff --git a/src/Layers/xrRenderPC_R1/LightShadows.h b/src/Layers/xrRenderPC_R1/LightShadows.h index c236b5a7360..b99053be96f 100644 --- a/src/Layers/xrRenderPC_R1/LightShadows.h +++ b/src/Layers/xrRenderPC_R1/LightShadows.h @@ -48,9 +48,9 @@ class CLightShadows cache_item() { - O = 0; - L = 0; - tris = 0; + O = nullptr; + L = nullptr; + tris = nullptr; } }; diff --git a/src/Layers/xrRenderPC_R3/r3.h b/src/Layers/xrRenderPC_R3/r3.h index 35571cb2516..3b4ffd268d7 100644 --- a/src/Layers/xrRenderPC_R3/r3.h +++ b/src/Layers/xrRenderPC_R3/r3.h @@ -44,7 +44,6 @@ class CRender : public D3DXRenderBase MMSM_AUTODETECT }; -public: struct _options { u32 bug : 1; @@ -135,7 +134,6 @@ class CRender : public D3DXRenderBase void FrameEnd() {} }; -public: RenderR3Statistics Stats; // Sector detection and visibility CSector* pLastSector; @@ -217,7 +215,6 @@ class CRender : public D3DXRenderBase void init_cacades(); void render_sun_cascades(); -public: ShaderElement* rimp_select_sh_static(dxRender_Visual* pVisual, float cdist_sq); ShaderElement* rimp_select_sh_dynamic(dxRender_Visual* pVisual, float cdist_sq); D3DVERTEXELEMENT9* getVB_Format(int id, BOOL _alt = FALSE); @@ -231,9 +228,10 @@ class CRender : public D3DXRenderBase int translateSector(IRender_Sector* pSector); // HW-occlusion culling - IC u32 occq_begin(u32& ID) { return HWOCC.occq_begin(ID); } - IC void occq_end(u32& ID) { HWOCC.occq_end(ID); } - IC R_occlusion::occq_result occq_get(u32& ID) { return HWOCC.occq_get(ID); } + u32 occq_begin(u32& ID) { return HWOCC.occq_begin(ID); } + void occq_end(u32& ID) { HWOCC.occq_end(ID); } + R_occlusion::occq_result occq_get(u32& ID) { return HWOCC.occq_get(ID); } + ICF void apply_object(IRenderable* O) { if (0 == O) @@ -247,7 +245,8 @@ class CRender : public D3DXRenderBase o_sun = 0.75f * LT.get_sun(); CopyMemory(o_hemi_cube, LT.get_hemi_cube(), CROS_impl::NUM_FACES * sizeof(float)); } - IC void apply_lmaterial() + + void apply_lmaterial() { R_constant* C = &*RCache.get_c(c_sbase); // get sampler if (0 == C) @@ -268,7 +267,6 @@ class CRender : public D3DXRenderBase o_hemi_cube[CROS_impl::CUBE_FACE_NEG_Z]); } -public: // feature level virtual GenerationLevel get_generation() { return IRender::GENERATION_R2; } virtual bool is_sun_static() { return o.sunstatic; } diff --git a/src/Layers/xrRenderPC_R3/r3_rendertarget.h b/src/Layers/xrRenderPC_R3/r3_rendertarget.h index c6477d1533c..81185600dab 100644 --- a/src/Layers/xrRenderPC_R3/r3_rendertarget.h +++ b/src/Layers/xrRenderPC_R3/r3_rendertarget.h @@ -13,7 +13,6 @@ class light; class CRenderTarget : public IRender_Target { -private: u32 dwWidth; u32 dwHeight; u32 dwAccumulatorClearMark; @@ -325,17 +324,17 @@ class CRenderTarget : public IRender_Target void DoAsyncScreenshot(); #ifdef DEBUG - IC void dbg_addline(Fvector& P0, Fvector& P1, u32 c) + void dbg_addline(Fvector& P0, Fvector& P1, u32 c) { dbg_lines.push_back(dbg_line_t()); dbg_lines.back().P0 = P0; dbg_lines.back().P1 = P1; dbg_lines.back().color = c; } - IC void dbg_addplane(Fplane& P0, u32 /*c*/) { dbg_planes.push_back(P0); } - { + + void dbg_addplane(Fplane& P0, u32 /*c*/) { dbg_planes.push_back(P0); } + #else - IC void dbg_addline(Fvector& /*P0*/, Fvector& /*P1*/, u32 /*c*/) {} - IC void dbg_addplane(Fplane& /*P0*/, u32 /*c*/) {} + void dbg_addline(Fvector& /*P0*/, Fvector& /*P1*/, u32 /*c*/) {} + void dbg_addplane(Fplane& /*P0*/, u32 /*c*/) {} #endif -}; diff --git a/src/Layers/xrRenderPC_R3/r3_rendertarget_enable_scissor.cpp b/src/Layers/xrRenderPC_R3/r3_rendertarget_enable_scissor.cpp index e019e08d18f..909c496e9dd 100644 --- a/src/Layers/xrRenderPC_R3/r3_rendertarget_enable_scissor.cpp +++ b/src/Layers/xrRenderPC_R3/r3_rendertarget_enable_scissor.cpp @@ -85,7 +85,7 @@ BOOL CRenderTarget::enable_scissor(light* L) // true if intersects near plane P.n.set(plane.x, plane.y, plane.z); P.d = plane.w; float p_dist = P.classify(L->spatial.sphere.P) - L->spatial.sphere.R; - near_intersect = (p_dist <= 0); + near_intersect = p_dist <= 0; } #ifdef DEBUG if (1) diff --git a/src/Layers/xrRenderPC_R3/r3_rendertarget_phase_PP.cpp b/src/Layers/xrRenderPC_R3/r3_rendertarget_phase_PP.cpp index 84c1c28122c..d77b1df90a2 100644 --- a/src/Layers/xrRenderPC_R3/r3_rendertarget_phase_PP.cpp +++ b/src/Layers/xrRenderPC_R3/r3_rendertarget_phase_PP.cpp @@ -60,10 +60,10 @@ void CRenderTarget::u_calc_tc_duality_ss(Fvector2& r0, Fvector2& r1, Fvector2& l BOOL CRenderTarget::u_need_PP() { - bool _blur = (param_blur > 0.001f); - bool _gray = (param_gray > 0.001f); - bool _noise = (param_noise > 0.001f); - bool _dual = (param_duality_h > 0.001f) || (param_duality_v > 0.001f); + bool _blur = param_blur > 0.001f; + bool _gray = param_gray > 0.001f; + bool _noise = param_noise > 0.001f; + bool _dual = param_duality_h > 0.001f || param_duality_v > 0.001f; // bool _menu_pp= g_pGamePersistent?g_pGamePersistent->OnRenderPPUI_query():false; @@ -100,7 +100,8 @@ struct TL_2c3uv u32 color0; u32 color1; Fvector2 uv[3]; - IC void set(float x, float y, u32 c0, u32 c1, float u0, float v0, float u1, float v1, float u2, float v2) + + void set(float x, float y, u32 c0, u32 c1, float u0, float v0, float u1, float v1, float u2, float v2) { p.set(x, y, EPS_S, 1.f); color0 = c0; diff --git a/src/utils/ETools/ETools.vcxproj b/src/utils/ETools/ETools.vcxproj index 40c32844a99..4541e66bd99 100644 --- a/src/utils/ETools/ETools.vcxproj +++ b/src/utils/ETools/ETools.vcxproj @@ -270,6 +270,9 @@ {a0f7d1fb-59a7-4717-a7e4-96f37e91998e} false + + {7885cf3c-ee04-4c67-9467-1fbf9a36b037} + {f1836ce2-59ef-4189-8b9c-d103a511cb27} diff --git a/src/utils/xrSE_Factory/ai_space.cpp b/src/utils/xrSE_Factory/ai_space.cpp index 026f627a585..f28e20fd12e 100644 --- a/src/utils/xrSE_Factory/ai_space.cpp +++ b/src/utils/xrSE_Factory/ai_space.cpp @@ -10,9 +10,9 @@ #include "ai_space.h" #include "xrScriptEngine/script_engine.hpp" -CAI_Space* g_ai_space = 0; +CAI_Space* g_ai_space = nullptr; -CAI_Space::CAI_Space() { m_script_engine = 0; } +CAI_Space::CAI_Space() { m_script_engine = nullptr; } void CAI_Space::init() { VERIFY(!m_script_engine); diff --git a/src/utils/xrSE_Factory/ai_space_inline.h b/src/utils/xrSE_Factory/ai_space_inline.h index 3986bf50971..a054f1b7cec 100644 --- a/src/utils/xrSE_Factory/ai_space_inline.h +++ b/src/utils/xrSE_Factory/ai_space_inline.h @@ -11,7 +11,7 @@ IC CScriptEngine& CAI_Space::script_engine() const { VERIFY(m_script_engine); - return (*m_script_engine); + return *m_script_engine; } IC CAI_Space& ai() @@ -21,5 +21,5 @@ IC CAI_Space& ai() g_ai_space = xr_new(); g_ai_space->init(); } - return (*g_ai_space); + return *g_ai_space; } diff --git a/src/utils/xrSE_Factory/properties_list_helper_script.cpp b/src/utils/xrSE_Factory/properties_list_helper_script.cpp index 74642994ffb..52f0b04dbba 100644 --- a/src/utils/xrSE_Factory/properties_list_helper_script.cpp +++ b/src/utils/xrSE_Factory/properties_list_helper_script.cpp @@ -22,10 +22,10 @@ struct CChooseType typedef IPropHelper&(__stdcall* TPHelper)(); -TPHelper _PHelper = 0; -HMODULE prop_helper_module = 0; +TPHelper _PHelper = nullptr; +HMODULE prop_helper_module = nullptr; LPCSTR prop_helper_library = "xrEPropsB", prop_helper_func = "PHelper"; -CScriptPropertiesListHelper* g_property_list_helper = 0; +CScriptPropertiesListHelper* g_property_list_helper = nullptr; void load_prop_helper() { diff --git a/src/utils/xrSE_Factory/script_debugger_utils.cpp b/src/utils/xrSE_Factory/script_debugger_utils.cpp index bf31decd605..749cc03b36c 100644 --- a/src/utils/xrSE_Factory/script_debugger_utils.cpp +++ b/src/utils/xrSE_Factory/script_debugger_utils.cpp @@ -7,7 +7,7 @@ # include #endif*/ -xr_event::xr_event(bool broadcast, bool signalled) { m_event = CreateEvent(0, broadcast, signalled, 0); } +xr_event::xr_event(bool broadcast, bool signalled) { m_event = CreateEvent(nullptr, broadcast, signalled, nullptr); } xr_event::~xr_event() { CloseHandle(m_event); } bool xr_event::signal() { return SetEvent(m_event) != 0; } bool xr_event::reset() { return ResetEvent(m_event) != 0; } @@ -54,7 +54,7 @@ DWORD __stdcall xrThreadStart(void* th) return 0; } -xr_thread::xr_thread() : m_thread(0) {} +xr_thread::xr_thread() : m_thread(nullptr) {} xr_thread::~xr_thread() { if (m_thread) @@ -65,8 +65,8 @@ bool xr_thread::start() { kill(); DWORD dwID; - m_thread = CreateThread(0, 0, &xrThreadStart, (void*)this, 0, &dwID); - return m_thread != 0; + m_thread = CreateThread(nullptr, 0, &xrThreadStart, (void*)this, 0, &dwID); + return m_thread != nullptr; } bool xr_thread::kill() @@ -80,7 +80,7 @@ bool xr_thread::kill() if (res) { CloseHandle(m_thread); - m_thread = 0; + m_thread = nullptr; } return res != 0; } diff --git a/src/utils/xrSE_Factory/script_properties_list_helper.cpp b/src/utils/xrSE_Factory/script_properties_list_helper.cpp index 24e41821356..1e6e298bcdd 100644 --- a/src/utils/xrSE_Factory/script_properties_list_helper.cpp +++ b/src/utils/xrSE_Factory/script_properties_list_helper.cpp @@ -174,7 +174,7 @@ ChooseValue* CScriptPropertiesListHelper::CreateChoose( ChooseValue* CScriptPropertiesListHelper::CreateChoose( PropItemVec* items, LPCSTR key, luabind::object object, LPCSTR name, u32 mode) { - return (PHelper().CreateChoose(*items, key, wrap_value(object, name), mode, 0)); + return (PHelper().CreateChoose(*items, key, wrap_value(object, name), mode, nullptr)); } // S8Value* CScriptPropertiesListHelper::CreateS8 (PropItemVec* items, LPCSTR key, luabind::object object, LPCSTR diff --git a/src/xrEngine/Device_destroy.cpp b/src/xrEngine/Device_destroy.cpp index 05b0b73fc81..a3f15c7c550 100644 --- a/src/xrEngine/Device_destroy.cpp +++ b/src/xrEngine/Device_destroy.cpp @@ -4,7 +4,7 @@ #include "IGame_Persistent.h" #include "xr_IOConsole.h" -void CRenderDevice::Destroy(void) +void CRenderDevice::Destroy() { if (!b_is_Ready) return; diff --git a/src/xrEngine/Environment.h b/src/xrEngine/Environment.h index 3b3e6b1a3f6..d25a0b34390 100644 --- a/src/xrEngine/Environment.h +++ b/src/xrEngine/Environment.h @@ -96,7 +96,7 @@ class ENGINE_API CEnvAmbient return (m_sound_dist.x < m_sound_dist.y) ? Random.randF(m_sound_dist.x, m_sound_dist.y) : 0; } INGAME_EDITOR_VIRTUAL ~SSndChannel() {} - inline INGAME_EDITOR_VIRTUAL sounds_type& sounds() { return m_sounds; } + INGAME_EDITOR_VIRTUAL sounds_type& sounds() { return m_sounds; } protected: xr_vector m_sounds; }; @@ -112,18 +112,18 @@ class ENGINE_API CEnvAmbient shared_str m_ambients_config_filename; public: - IC const shared_str& name() { return m_load_section; } - IC const shared_str& get_ambients_config_filename() { return m_ambients_config_filename; } + const shared_str& name() { return m_load_section; } + const shared_str& get_ambients_config_filename() { return m_ambients_config_filename; } INGAME_EDITOR_VIRTUAL void load(CInifile& ambients_config, CInifile& sound_channels_config, CInifile& effects_config, const shared_str& section); - IC SEffect* get_rnd_effect() { return effects().empty() ? 0 : effects()[Random.randI(effects().size())]; } - IC u32 get_rnd_effect_time() { return Random.randI(m_effect_period.x, m_effect_period.y); } + SEffect* get_rnd_effect() { return effects().empty() ? 0 : effects()[Random.randI(effects().size())]; } + u32 get_rnd_effect_time() { return Random.randI(m_effect_period.x, m_effect_period.y); } INGAME_EDITOR_VIRTUAL SEffect* create_effect(CInifile& config, LPCSTR id); INGAME_EDITOR_VIRTUAL SSndChannel* create_sound_channel(CInifile& config, LPCSTR id); INGAME_EDITOR_VIRTUAL ~CEnvAmbient(); void destroy(); - inline INGAME_EDITOR_VIRTUAL EffectVec& effects() { return m_effects; } - inline INGAME_EDITOR_VIRTUAL SSndChannelVec& get_snd_channels() { return m_sound_channels; } + INGAME_EDITOR_VIRTUAL EffectVec& effects() { return m_effects; } + INGAME_EDITOR_VIRTUAL SSndChannelVec& get_snd_channels() { return m_sound_channels; } }; class ENGINE_API CEnvDescriptor @@ -223,7 +223,7 @@ class ENGINE_API CEnvironment friend class dxEnvironmentRender; struct str_pred : public std::binary_function { - IC bool operator()(const shared_str& x, const shared_str& y) const { return xr_strcmp(x, y) < 0; } + bool operator()(const shared_str& x, const shared_str& y) const { return xr_strcmp(x, y) < 0; } }; public: diff --git a/src/xrScriptEngine/script_debugger.hpp b/src/xrScriptEngine/script_debugger.hpp index 698c13fb035..7123527c73f 100644 --- a/src/xrScriptEngine/script_debugger.hpp +++ b/src/xrScriptEngine/script_debugger.hpp @@ -45,7 +45,7 @@ class XRSCRIPTENGINE_API CScriptDebugger void StackLevelChanged(); void initiateDebugBreak(); void DebugBreak(const char* szFile, int nLine); - void ErrorBreak(const char* szFile = 0, int nLine = 0); + void ErrorBreak(const char* szFile = nullptr, int nLine = 0); void LineHook(const char* szFile, int nLine); void FunctionHook(const char* szFile, int nLine, BOOL bCall); void Write(const char* szMsg); diff --git a/src/xrServerEntities/ItemListTypes.h b/src/xrServerEntities/ItemListTypes.h index 219dd934218..92f95b65102 100644 --- a/src/xrServerEntities/ItemListTypes.h +++ b/src/xrServerEntities/ItemListTypes.h @@ -39,8 +39,8 @@ class ListItem public: ListItem(int _type) - : type(_type), prop_color(0), item(0), key(0), tag(0), icon_index(-1), OnDrawThumbnail(0), OnItemFocused(0), - m_Object(0) + : type(_type), prop_color(0), item(nullptr), key(nullptr), tag(0), icon_index(-1), OnDrawThumbnail(nullptr), OnItemFocused(nullptr), + m_Object(nullptr) { m_Flags.zero(); } diff --git a/src/xrServerEntities/PropertiesListTypes.h b/src/xrServerEntities/PropertiesListTypes.h index 69be8f15f2e..2d9b9fc16e8 100644 --- a/src/xrServerEntities/PropertiesListTypes.h +++ b/src/xrServerEntities/PropertiesListTypes.h @@ -66,23 +66,22 @@ class PropValue public: u32 tag; -public: // base events typedef fastdelegate::FastDelegate1 TOnChange; + TOnChange OnChangeEvent; -public: - PropValue() : tag(0), m_Owner(0), OnChangeEvent(0) { ; } + PropValue() : m_Owner(nullptr), tag(0), OnChangeEvent(nullptr) {} virtual ~PropValue() {} virtual xr_string GetDrawText(TOnDrawTextEvent OnDrawText) = 0; virtual void ResetValue() = 0; virtual bool Equal(PropValue* prop) = 0; - IC PropItem* Owner() { return m_Owner; } + PropItem* Owner() { return m_Owner; } }; //------------------------------------------------------------------------------ template -IC void set_value(T& val, const T& _val) +void set_value(T& val, const T& _val) { val = _val; }; @@ -93,32 +92,34 @@ class CustomValue : public PropValue public: typedef T TYPE; -public: TYPE init_value; TYPE* value; -public: typedef fastdelegate::FastDelegate2 TOnBeforeEditEvent; typedef fastdelegate::FastDelegate2 TOnAfterEditEvent; TOnBeforeEditEvent OnBeforeEditEvent; TOnAfterEditEvent OnAfterEditEvent; -public: CustomValue(T* val) { OnBeforeEditEvent = 0; OnAfterEditEvent = 0; set_value(value, val); set_value(init_value, *val); - }; + } + virtual xr_string GetDrawText(TOnDrawTextEvent /*OnDrawText*/) { return ""; } + virtual bool Equal(PropValue* val) { CustomValue* prop = (CustomValue*)val; return (*value == *prop->value); } + virtual const T& GetValue() { return *value; } + virtual void ResetValue() { set_value(*value, init_value); } + bool ApplyValue(const T& val) { if (!(*value == val)) @@ -170,8 +171,8 @@ class PropItem public: PropItem(EPropType _type) - : type(_type), prop_color(0), val_color(0), item(0), key(0), OnClickEvent(0), OnDrawTextEvent(0), - OnItemFocused(0) + : type(_type), prop_color(0), val_color(0), item(nullptr), key(nullptr), OnClickEvent(nullptr), OnDrawTextEvent(nullptr), + OnItemFocused(nullptr) { m_Flags.zero(); } @@ -180,26 +181,30 @@ class PropItem for (PropValueIt it = values.begin(); values.end() != it; ++it) xr_delete(*it); }; - IC TProperties* Owner() { return m_Owner; } + TProperties* Owner() { return m_Owner; } void SetName(const shared_str& name) { key = name; } - IC void ResetValues() + + void ResetValues() { for (PropValueIt it = values.begin(); values.end() != it; ++it) (*it)->ResetValue(); CheckMixed(); } - IC void AppendValue(PropValue* value) + + void AppendValue(PropValue* value) { if (!values.empty() && !value->Equal(values.front())) m_Flags.set(flMixed, TRUE); values.push_back(value); } - IC xr_string GetDrawText() + + xr_string GetDrawText() { VERIFY(!values.empty()); return m_Flags.is(flMixed) ? xr_string("(mixed)") : values.front()->GetDrawText(OnDrawTextEvent); } - IC void CheckMixed() + + void CheckMixed() { m_Flags.set(flMixed, FALSE); if (values.size() > 1) @@ -219,7 +224,7 @@ class PropItem } template - IC void BeforeEdit(T2& val) + void BeforeEdit(T2& val) { T1* CV = smart_cast(values.front()); VERIFY(CV); @@ -227,7 +232,7 @@ class PropItem CV->OnBeforeEditEvent(CV, val); } template - IC bool AfterEdit(T2& val) + bool AfterEdit(T2& val) { T1* CV = smart_cast(values.front()); VERIFY(CV); @@ -236,7 +241,7 @@ class PropItem return true; } template - IC bool ApplyValue(const T2& val) + bool ApplyValue(const T2& val) { bool bChanged = false; m_Flags.set(flMixed, FALSE); @@ -255,20 +260,23 @@ class PropItem } return bChanged; } - IC PropValueVec& Values() { return values; } - IC PropValue* GetFrontValue() + + PropValueVec& Values() { return values; } + + PropValue* GetFrontValue() { VERIFY(!values.empty()); return values.front(); }; - IC EPropType Type() { return type; } + EPropType Type() { return type; } #ifdef __BORLANDC__ IC TElTreeItem* Item() { return (TElTreeItem*)item; } #endif - IC LPCSTR Key() { return key.c_str(); } - IC void Enable(BOOL val) { m_Flags.set(flDisabled, !val); } - IC BOOL Enabled() { return !m_Flags.is(flDisabled); } - IC void OnChange() + LPCSTR Key() { return key.c_str(); } + void Enable(BOOL val) { m_Flags.set(flDisabled, !val); } + BOOL Enabled() { return !m_Flags.is(flDisabled); } + + void OnChange() { for (PropValueIt it = values.begin(); values.end() != it; ++it) if (!(*it)->OnChangeEvent.empty()) @@ -296,7 +304,7 @@ class CaptionValue : public PropValue public: CaptionValue(const shared_str& val) { value = val; } virtual xr_string GetDrawText(TOnDrawTextEvent) { return value.c_str() ? value.c_str() : ""; } - virtual void ResetValue() { ; } + virtual void ResetValue() {} virtual bool Equal(PropValue* val) { return (value == ((CaptionValue*)val)->value); } bool ApplyValue(const shared_str& val) { @@ -313,15 +321,13 @@ class CanvasValue : public PropValue typedef fastdelegate::FastDelegate3 TOnTestEqual; typedef fastdelegate::FastDelegate3 TOnDrawCanvasEvent; -public: int height; TOnTestEqual OnTestEqual; TOnDrawCanvasEvent OnDrawCanvasEvent; -public: - CanvasValue(const shared_str& val, int h) : OnDrawCanvasEvent(0), OnTestEqual(0), height(h) { value = val; } + CanvasValue(const shared_str& val, int h) : OnDrawCanvasEvent(nullptr), OnTestEqual(nullptr), height(h) { value = val; } virtual xr_string GetDrawText(TOnDrawTextEvent) { return value.c_str() ? value.c_str() : ""; } - virtual void ResetValue() { ; } + virtual void ResetValue() {} virtual bool Equal(PropValue* val) { if (!OnTestEqual.empty()) @@ -347,11 +353,10 @@ class ButtonValue : public PropValue }; Flags32 m_Flags; -public: ButtonValue(const shared_str& val, u32 flags) { m_Flags.assign(flags); - OnBtnClickEvent = 0; + OnBtnClickEvent = nullptr; btn_num = -1; xr_string v; int cnt = _GetItemCount(val.c_str()); @@ -363,7 +368,7 @@ class ButtonValue : public PropValue shared_str t = _ListToSequence(value); return t.c_str() ? t.c_str() : ""; } - virtual void ResetValue() { ; } + virtual void ResetValue() {} virtual bool Equal(PropValue* /*val*/) { return true; } bool OnBtnClick(bool& bSafe) { @@ -386,7 +391,6 @@ class ShortcutValue : public CustomValue typedef fastdelegate::FastDelegate3 TOnValidateResult; TOnValidateResult OnValidateResultEvent; -public: ShortcutValue(TYPE* val) : CustomValue(val) {} virtual xr_string GetDrawText(TOnDrawTextEvent OnDrawText); bool ApplyValue(const xr_shortcut& val) @@ -405,6 +409,7 @@ class ShortcutValue : public CustomValue return false; } }; + class RTextValue : public CustomValue { public: @@ -417,6 +422,7 @@ class RTextValue : public CustomValue return txt; } }; + class STextValue : public CustomValue { public: @@ -440,17 +446,16 @@ class CTextValue : public PropValue public: typedef fastdelegate::FastDelegate2 TOnBeforeEditEvent; typedef fastdelegate::FastDelegate2 TOnAfterEditEvent; + TOnBeforeEditEvent OnBeforeEditEvent; TOnAfterEditEvent OnAfterEditEvent; -public: int lim; -public: CTextValue(LPSTR val, int _lim) : value(val), init_value(val), lim(_lim) { - OnBeforeEditEvent = 0; - OnAfterEditEvent = 0; + OnBeforeEditEvent = nullptr; + OnAfterEditEvent = nullptr; }; virtual xr_string GetDrawText(TOnDrawTextEvent OnDrawText) { @@ -459,7 +464,9 @@ class CTextValue : public PropValue OnDrawText(this, txt); return txt; } + virtual bool Equal(PropValue* val) { return (0 == xr_strcmp(value, ((CTextValue*)val)->value)); } + bool ApplyValue(LPCSTR val) { if (0 != xr_strcmp(value, val)) @@ -469,6 +476,7 @@ class CTextValue : public PropValue } return false; } + LPSTR GetValue() { return value; } virtual void ResetValue() { xr_strcpy(value, init_value.size() + 1, init_value.c_str()); } }; @@ -493,12 +501,10 @@ class ChooseValue : public RTextValue m_Items->push_back(SChooseItem(name, hint)); } -public: ChooseValue(shared_str* val, u32 cid, LPCSTR path, void* param, u32 sub_item_count, u32 choose_flags) - : RTextValue(val), m_ChooseID(cid), m_StartPath(path), subitem(sub_item_count), m_Items(0), m_FillParam(param), - OnChooseFillEvent(0), OnDrawThumbnailEvent(0), m_ChooseFlags(choose_flags) - { - } + : RTextValue(val), m_ChooseID(cid), m_StartPath(path), subitem(sub_item_count), m_Items(nullptr), m_FillParam(param), + OnChooseFillEvent(nullptr), OnDrawThumbnailEvent(nullptr), m_ChooseFlags(choose_flags) + {} }; typedef CustomValue BOOLValue; @@ -571,7 +577,7 @@ class NumericValue : public CustomValue //------------------------------------------------------------------------------ template -IC xr_string draw_sprintf(xr_string& s, const T& V, int tag) +xr_string draw_sprintf(xr_string& s, const T& V, int tag) { string256 tmp; xr_sprintf(tmp, sizeof(tmp), "%d", V); @@ -636,7 +642,6 @@ class FlagValueCustom }; Flags32 m_Flags; -public: FlagValueCustom(u32 mask, LPCSTR c0, LPCSTR c1) { caption[0] = c0; @@ -654,14 +659,12 @@ class FlagValue : public CustomValue, public FlagValueCustom typedef T TYPE; typedef typename T::TYPE FLAG_TYPE; -public: FLAG_TYPE mask; -public: FlagValue(T* val, FLAG_TYPE _mask, LPCSTR c0, LPCSTR c1, u32 flags) : CustomValue(val), FlagValueCustom(flags, c0, c1), mask(_mask) - { - } + {} + virtual xr_string GetDrawText(TOnDrawTextEvent OnDrawText) { xr_string draw_val; @@ -675,6 +678,7 @@ class FlagValue : public CustomValue, public FlagValueCustom virtual const T& GetValue() { return *value; } virtual void ResetValue() { value->set(mask, init_value.is(mask)); } virtual bool GetValueEx() { return !!value->is(mask); } + bool ApplyValue(const T& val) { if (!val.equal(*value, mask)) @@ -701,8 +705,9 @@ class TokenValueCustom { public: xr_token* token; - TokenValueCustom(xr_token* _token) : token(_token) { ; } + TokenValueCustom(xr_token* _token) : token(_token) {} }; + template class TokenValue : public CustomValue, public TokenValueCustom { @@ -720,6 +725,7 @@ class TokenValue : public CustomValue, public TokenValueCustom return draw_val; } }; + //------------------------------------------------------------------------------ typedef TokenValue Token8Value; typedef TokenValue Token16Value; @@ -731,8 +737,9 @@ class RTokenValueCustom public: xr_rtoken* token; u32 token_count; - RTokenValueCustom(xr_rtoken* _token, u32 _t_cnt) : token(_token), token_count(_t_cnt) { ; } + RTokenValueCustom(xr_rtoken* _token, u32 _t_cnt) : token(_token), token_count(_t_cnt) {} }; + template class RTokenValue : public CustomValue, public RTokenValueCustom { @@ -750,6 +757,7 @@ class RTokenValue : public CustomValue, public RTokenValueCustom return draw_val; } }; + //------------------------------------------------------------------------------ typedef RTokenValue RToken8Value; typedef RTokenValue RToken16Value; @@ -767,7 +775,6 @@ class TokenValueSH : public CustomValue u32 cnt; const Item* items; -public: TokenValueSH(u32* val, const Item* _items, u32 _cnt) : CustomValue(val), cnt(_cnt), items(_items){}; virtual xr_string GetDrawText(TOnDrawTextEvent /*OnDrawText*/) { @@ -775,7 +782,7 @@ class TokenValueSH : public CustomValue for (u32 i = 0; i < cnt; i++) if (items[i].ID == draw_val) return items[i].str; - return 0; + return nullptr; } }; //------------------------------------------------------------------------------ @@ -786,7 +793,6 @@ class RListValue : public RTextValue shared_str* items; u32 item_count; -public: RListValue(shared_str* val, shared_str* _items, u32 cnt) : RTextValue(val), items(_items), item_count(cnt){}; virtual bool Equal(PropValue* val) { @@ -804,7 +810,6 @@ class CListValue : public CTextValue xr_string* items; u32 item_count; -public: CListValue(LPSTR val, u32 sz, xr_string* _items, u32 cnt) : CTextValue(val, sz), items(_items), item_count(cnt){}; virtual bool Equal(PropValue* val) { diff --git a/src/xrServerEntities/alife_human_brain.cpp b/src/xrServerEntities/alife_human_brain.cpp index a43fc5fd23e..89595253704 100644 --- a/src/xrServerEntities/alife_human_brain.cpp +++ b/src/xrServerEntities/alife_human_brain.cpp @@ -73,7 +73,7 @@ CALifeHumanBrain::~CALifeHumanBrain() void CALifeHumanBrain::on_state_write(NET_Packet& packet) { - if (packet.inistream == NULL) + if (packet.inistream == nullptr) { save_data(m_cpEquipmentPreferences, packet); save_data(m_cpMainWeaponPreferences, packet); @@ -112,7 +112,7 @@ void CALifeHumanBrain::on_state_read(NET_Packet& packet) load_data(temp, packet); } - if (packet.inistream == NULL) + if (packet.inistream == nullptr) { load_data(m_cpEquipmentPreferences, packet); load_data(m_cpMainWeaponPreferences, packet); diff --git a/src/xrServerEntities/alife_monster_brain.cpp b/src/xrServerEntities/alife_monster_brain.cpp index ae4857770d6..cb1194aa786 100644 --- a/src/xrServerEntities/alife_monster_brain.cpp +++ b/src/xrServerEntities/alife_monster_brain.cpp @@ -40,7 +40,7 @@ CALifeMonsterBrain::CALifeMonsterBrain(object_type* object) VERIFY(object); m_object = object; m_last_search_time = 0; - m_smart_terrain = 0; + m_smart_terrain = nullptr; #ifdef XRGAME_EXPORTS m_movement_manager = new CALifeMonsterMovementManager(object); diff --git a/src/xrServerEntities/alife_space.cpp b/src/xrServerEntities/alife_space.cpp index f5d3447c153..6ad646e4328 100644 --- a/src/xrServerEntities/alife_space.cpp +++ b/src/xrServerEntities/alife_space.cpp @@ -17,7 +17,7 @@ const xr_token hit_types_token[] = {"wound_2", eHitTypeWound_2}, //{"physic_strike", eHitTypePhysicStrike}, {"light_burn", eHitTypeLightBurn}, - {0, 0} + {nullptr, 0} }; EHitType g_tfString2HitType(LPCSTR caHitType) diff --git a/src/xrServerEntities/character_info.cpp b/src/xrServerEntities/character_info.cpp index ddb537ffd8f..e7be0c10d46 100644 --- a/src/xrServerEntities/character_info.cpp +++ b/src/xrServerEntities/character_info.cpp @@ -17,7 +17,7 @@ ////////////////////////////////////////////////////////////////////////// SCharacterProfile::SCharacterProfile() { - m_CharacterId = NULL; + m_CharacterId = nullptr; m_Rank = NO_RANK; m_Reputation = NO_REPUTATION; } @@ -27,8 +27,8 @@ SCharacterProfile::~SCharacterProfile() {} CCharacterInfo::CCharacterInfo() { - m_ProfileId = NULL; - m_SpecificCharacterId = NULL; + m_ProfileId = nullptr; + m_SpecificCharacterId = nullptr; #ifdef XRGAME_EXPORTS m_CurrentRank.set(NO_RANK); @@ -42,7 +42,7 @@ CCharacterInfo::~CCharacterInfo() {} void CCharacterInfo::Load(shared_str id) { m_ProfileId = id; - inherited_shared::load_shared(m_ProfileId, NULL); + inherited_shared::load_shared(m_ProfileId, nullptr); } #ifdef XRGAME_EXPORTS @@ -77,12 +77,12 @@ void CCharacterInfo::load_shared(LPCSTR) pXML->SetLocalRoot(item_node); - LPCSTR spec_char = pXML->Read("specific_character", 0, NULL); + LPCSTR spec_char = pXML->Read("specific_character", 0, nullptr); if (!spec_char) { - data()->m_CharacterId = NULL; + data()->m_CharacterId = nullptr; - LPCSTR char_class = pXML->Read("class", 0, NULL); + LPCSTR char_class = pXML->Read("class", 0, nullptr); if (char_class) { diff --git a/src/xrServerEntities/gametype_chooser.cpp b/src/xrServerEntities/gametype_chooser.cpp index 549e877f5a5..ea8a42b190b 100644 --- a/src/xrServerEntities/gametype_chooser.cpp +++ b/src/xrServerEntities/gametype_chooser.cpp @@ -16,7 +16,7 @@ enum ERPGameType xr_token rpoint_game_type[] = {{"Any game", rpgtGameAny}, {"Deathmatch", rpgtGameDeathmatch}, {"TeamDeathmatch", rpgtGameTeamDeathmatch}, {"ArtefactHunt", rpgtGameArtefactHunt}, - {"CaptureTheArtefact", rpgtGameCaptureTheArtefact}, {0, 0}}; + {"CaptureTheArtefact", rpgtGameCaptureTheArtefact}, {nullptr, 0}}; #ifdef _EDITOR bool GameTypeChooser::LoadStream(IReader& F) diff --git a/src/xrServerEntities/object_factory.cpp b/src/xrServerEntities/object_factory.cpp index 0fb32d7c2de..350a20b15ac 100644 --- a/src/xrServerEntities/object_factory.cpp +++ b/src/xrServerEntities/object_factory.cpp @@ -10,7 +10,7 @@ #include "object_factory.h" #include "Common/object_broker.h" -CObjectFactory* g_object_factory = 0; +CObjectFactory* g_object_factory = nullptr; CObjectFactory::CObjectFactory() { diff --git a/src/xrServerEntities/object_factory_inline.h b/src/xrServerEntities/object_factory_inline.h index 213946eb2d6..bf1604c2604 100644 --- a/src/xrServerEntities/object_factory_inline.h +++ b/src/xrServerEntities/object_factory_inline.h @@ -65,7 +65,7 @@ IC const CObjectItemAbstract* CObjectFactory::item(const CLASS_ID& clsid, bool n if ((I == clsids().end()) || ((*I)->clsid() != clsid)) { R_ASSERT(no_assert); - return (0); + return (nullptr); } return (*I); } diff --git a/src/xrServerEntities/object_item_script.cpp b/src/xrServerEntities/object_item_script.cpp index c77f1185d9a..46031940b8e 100644 --- a/src/xrServerEntities/object_item_script.cpp +++ b/src/xrServerEntities/object_item_script.cpp @@ -42,12 +42,12 @@ ObjectFactory::ServerObjectBaseClass* CObjectItemScript::server_object(LPCSTR se catch (std::exception e) { Msg("Exception [%s] raised while creating server object from section [%s]", e.what(), section); - return (0); + return (nullptr); } catch (...) { Msg("Exception raised while creating server object from section [%s]", section); - return (0); + return (nullptr); } R_ASSERT(object); diff --git a/src/xrServerEntities/script_ini_file.cpp b/src/xrServerEntities/script_ini_file.cpp index 545da4e6f9f..7a729453e4b 100644 --- a/src/xrServerEntities/script_ini_file.cpp +++ b/src/xrServerEntities/script_ini_file.cpp @@ -23,7 +23,7 @@ LPCSTR CScriptIniFile::update(LPCSTR file_name) { string_path S1; FS.update_path(S1, "$game_config$", file_name); - return (*shared_str(S1)); + return *shared_str(S1); } bool CScriptIniFile::line_exist(LPCSTR S, LPCSTR L) { return (!!inherited::line_exist(S, L)); } @@ -32,10 +32,10 @@ int CScriptIniFile::r_clsid(LPCSTR S, LPCSTR L) { return (object_factory().scrip bool CScriptIniFile::r_bool(LPCSTR S, LPCSTR L) { return (!!inherited::r_bool(S, L)); } int CScriptIniFile::r_token(LPCSTR S, LPCSTR L, const CScriptTokenList& token_list) { - return (inherited::r_token(S, L, &*token_list.tokens().begin())); + return inherited::r_token(S, L, &*token_list.tokens().begin()); } -LPCSTR CScriptIniFile::r_string_wb(LPCSTR S, LPCSTR L) { return (*inherited::r_string_wb(S, L)); } +LPCSTR CScriptIniFile::r_string_wb(LPCSTR S, LPCSTR L) { return *inherited::r_string_wb(S, L); } u32 CScriptIniFile::line_count(LPCSTR S) { THROW3(inherited::section_exist(S), "Cannot find section", S); diff --git a/src/xrServerEntities/script_ini_file.h b/src/xrServerEntities/script_ini_file.h index 6b6832eb361..23fddc4e5ea 100644 --- a/src/xrServerEntities/script_ini_file.h +++ b/src/xrServerEntities/script_ini_file.h @@ -16,7 +16,7 @@ class CScriptIniFile : public CInifile typedef CInifile inherited; public: - CScriptIniFile(IReader* F, LPCSTR path = 0); + CScriptIniFile(IReader* F, LPCSTR path = nullptr); CScriptIniFile(LPCSTR szFileName, BOOL ReadOnly = TRUE, BOOL bLoadAtStart = TRUE, BOOL SaveAtEnd = TRUE); virtual ~CScriptIniFile(); bool line_exist(LPCSTR S, LPCSTR L); diff --git a/src/xrServerEntities/script_rtoken_list_inline.h b/src/xrServerEntities/script_rtoken_list_inline.h index ecf9e2824d5..5440afffc6c 100644 --- a/src/xrServerEntities/script_rtoken_list_inline.h +++ b/src/xrServerEntities/script_rtoken_list_inline.h @@ -19,7 +19,7 @@ IC void CScriptRTokenList::remove(u32 index) IC LPCSTR CScriptRTokenList::get(u32 index) { if (index >= size()) - return (0); + return (nullptr); return (*m_values[index]); } diff --git a/src/xrServerEntities/script_value_container_impl.h b/src/xrServerEntities/script_value_container_impl.h index cf4513f997c..2a8c2cc1745 100644 --- a/src/xrServerEntities/script_value_container_impl.h +++ b/src/xrServerEntities/script_value_container_impl.h @@ -17,7 +17,7 @@ IC CScriptValueContainer::~CScriptValueContainer() { clear(); } IC void CScriptValueContainer::add(CScriptValue* new_value) { #ifdef XRSE_FACTORY_EXPORTS - CScriptValue* value = 0; + CScriptValue* value = nullptr; xr_vector::const_iterator I = m_values.begin(); xr_vector::const_iterator E = m_values.end(); for (; I != E; ++I) diff --git a/src/xrServerEntities/shared_data.h b/src/xrServerEntities/shared_data.h index 3feaa3dbf3e..3adac338b47 100644 --- a/src/xrServerEntities/shared_data.h +++ b/src/xrServerEntities/shared_data.h @@ -49,7 +49,7 @@ class CSingleton }; template -T* CSingleton::_self = NULL; +T* CSingleton::_self = nullptr; template int CSingleton::_refcount = 0; template @@ -108,7 +108,7 @@ class CSharedClass CSharedObj* pSharedObj; public: - CSharedClass() : _sd(NULL) + CSharedClass() : _sd(nullptr) { pSharedObj = CSharedObj::Instance(); pSharedObj->_on_self_delete = auto_delete; diff --git a/src/xrServerEntities/specific_character.cpp b/src/xrServerEntities/specific_character.cpp index 9c3750aa835..576a99cfbc6 100644 --- a/src/xrServerEntities/specific_character.cpp +++ b/src/xrServerEntities/specific_character.cpp @@ -30,7 +30,7 @@ SSpecificCharacterData::SSpecificCharacterData() SSpecificCharacterData::~SSpecificCharacterData() {} #endif -CSpecificCharacter::CSpecificCharacter() { m_OwnId = NULL; } +CSpecificCharacter::CSpecificCharacter() { m_OwnId = nullptr; } CSpecificCharacter::~CSpecificCharacter() {} void CSpecificCharacter::InitXmlIdToIndex() { @@ -44,7 +44,7 @@ void CSpecificCharacter::Load(shared_str id) { R_ASSERT(id.size()); m_OwnId = id; - inherited_shared::load_shared(m_OwnId, NULL); + inherited_shared::load_shared(m_OwnId, nullptr); } void CSpecificCharacter::load_shared(LPCSTR) diff --git a/src/xrServerEntities/xrEProps.h b/src/xrServerEntities/xrEProps.h index 2c76c02f0be..641e3a6bb67 100644 --- a/src/xrServerEntities/xrEProps.h +++ b/src/xrServerEntities/xrEProps.h @@ -92,9 +92,9 @@ class XR_EPROPS_API IPropHelper virtual CaptionValue* __stdcall CreateCaption(PropItemVec& items, shared_str key, shared_str val) = 0; virtual CanvasValue* __stdcall CreateCanvas(PropItemVec& items, shared_str key, shared_str val, int height) = 0; virtual ButtonValue* __stdcall CreateButton( - PropItemVec& items, shared_str key, shared_str val, u32 flags, ButtonValue::TOnBtnClick onclick = 0) = 0; + PropItemVec& items, shared_str key, shared_str val, u32 flags, ButtonValue::TOnBtnClick onclick = nullptr) = 0; virtual ChooseValue* __stdcall CreateChoose(PropItemVec& items, shared_str key, shared_str* val, u32 mode, - LPCSTR path = 0, void* fill_param = 0, u32 sub_item_count = 1, u32 choose_flags = cfAllowNone) = 0; + LPCSTR path = nullptr, void* fill_param = nullptr, u32 sub_item_count = 1, u32 choose_flags = cfAllowNone) = 0; virtual S8Value* __stdcall CreateS8( PropItemVec& items, shared_str key, s8* val, s8 mn = 0, s8 mx = 100, s8 inc = 1) = 0; virtual S16Value* __stdcall CreateS16( @@ -113,11 +113,11 @@ class XR_EPROPS_API IPropHelper virtual VectorValue* __stdcall CreateVector(PropItemVec& items, shared_str key, Fvector* val, float mn = 0.f, float mx = 1.f, float inc = 0.01f, int decim = 2) = 0; virtual Flag8Value* __stdcall CreateFlag8( - PropItemVec& items, shared_str key, Flags8* val, u8 mask, LPCSTR c0 = 0, LPCSTR c1 = 0, u32 flags = 0) = 0; + PropItemVec& items, shared_str key, Flags8* val, u8 mask, LPCSTR c0 = nullptr, LPCSTR c1 = nullptr, u32 flags = 0) = 0; virtual Flag16Value* __stdcall CreateFlag16( - PropItemVec& items, shared_str key, Flags16* val, u16 mask, LPCSTR c0 = 0, LPCSTR c1 = 0, u32 flags = 0) = 0; + PropItemVec& items, shared_str key, Flags16* val, u16 mask, LPCSTR c0 = nullptr, LPCSTR c1 = nullptr, u32 flags = 0) = 0; virtual Flag32Value* __stdcall CreateFlag32( - PropItemVec& items, shared_str key, Flags32* val, u32 mask, LPCSTR c0 = 0, LPCSTR c1 = 0, u32 flags = 0) = 0; + PropItemVec& items, shared_str key, Flags32* val, u32 mask, LPCSTR c0 = nullptr, LPCSTR c1 = nullptr, u32 flags = 0) = 0; virtual Token8Value* __stdcall CreateToken8(PropItemVec& items, shared_str key, u8* val, xr_token* token) = 0; virtual Token16Value* __stdcall CreateToken16(PropItemVec& items, shared_str key, u16* val, xr_token* token) = 0; virtual Token32Value* __stdcall CreateToken32(PropItemVec& items, shared_str key, u32* val, xr_token* token) = 0; @@ -145,7 +145,7 @@ class XR_EPROPS_API IPropHelper float mx = flt_max, float inc = 0.01f, int decim = 2) = 0; virtual RTextValue* __stdcall CreateName(PropItemVec& items, shared_str key, shared_str* val, ListItem* owner) = 0; virtual RTextValue* __stdcall CreateNameCB(PropItemVec& items, shared_str key, shared_str* val, - TOnDrawTextEvent = 0, RTextValue::TOnBeforeEditEvent = 0, RTextValue::TOnAfterEditEvent = 0) = 0; + TOnDrawTextEvent = nullptr, RTextValue::TOnBeforeEditEvent = nullptr, RTextValue::TOnAfterEditEvent = nullptr) = 0; virtual GameTypeValue* __stdcall CreateGameType(PropItemVec& items, shared_str key, GameTypeChooser* val) = 0; // obsolette @@ -177,7 +177,7 @@ class XR_EPROPS_API IListHelper public: virtual ListItem* __stdcall CreateItem( - ListItemsVec& items, LPCSTR key, int type, u32 item_flags = 0, void* object = 0) = 0; + ListItemsVec& items, LPCSTR key, int type, u32 item_flags = 0, void* object = nullptr) = 0; }; #ifdef __BORLANDC__ diff --git a/src/xrServerEntities/xrServer_Object_Base.cpp b/src/xrServerEntities/xrServer_Object_Base.cpp index 4c01eaf1213..7bee9ed0629 100644 --- a/src/xrServerEntities/xrServer_Object_Base.cpp +++ b/src/xrServerEntities/xrServer_Object_Base.cpp @@ -74,13 +74,13 @@ CSE_Abstract::CSE_Abstract(LPCSTR caSection) ID = 0xffff; ID_Parent = 0xffff; ID_Phantom = 0xffff; - owner = 0; + owner = nullptr; m_gameType.SetDefaults(); //. s_gameid = 0; s_RP = 0xFE; // Use supplied coords s_flags.assign(0); s_name = caSection; - s_name_replace = 0; // xr_strdup(""); + s_name_replace = nullptr; // xr_strdup(""); o_Angle.set(0.f, 0.f, 0.f); o_Position.set(0.f, 0.f, 0.f); m_bALifeControl = false; @@ -102,12 +102,12 @@ CSE_Abstract::CSE_Abstract(LPCSTR caSection) // m_next_spawn_time = 0; // m_min_spawn_interval = 0; // m_max_spawn_interval = 0; - m_ini_file = 0; + m_ini_file = nullptr; if (pSettings->line_exist(caSection, "custom_data")) { pcstr const raw_file_name = pSettings->r_string(caSection, "custom_data"); - IReader const* config = 0; + IReader const* config = nullptr; #ifdef XRGAME_EXPORTS if (ai().get_alife()) config = ai().alife().get_config(raw_file_name); @@ -151,9 +151,9 @@ CSE_Abstract::~CSE_Abstract() xr_delete(m_ini_file); } -CSE_Visual* CSE_Abstract::visual() { return (0); } -IServerEntityShape* CSE_Abstract::shape() { return (0); } -CSE_Motion* CSE_Abstract::motion() { return (0); } +CSE_Visual* CSE_Abstract::visual() { return (nullptr); } +IServerEntityShape* CSE_Abstract::shape() { return (nullptr); } +CSE_Motion* CSE_Abstract::motion() { return (nullptr); } CInifile& CSE_Abstract::spawn_ini() { if (!m_ini_file) @@ -337,7 +337,7 @@ BOOL CSE_Abstract::Spawn_Read(NET_Packet& tNetPacket) u16 size; tNetPacket.r_u16(size); // size bool b1 = (m_tClassID == CLSID_SPECTATOR); - bool b2 = (size > sizeof(size)) || (tNetPacket.inistream != NULL); + bool b2 = (size > sizeof(size)) || (tNetPacket.inistream != nullptr); R_ASSERT3((b1 || b2), "cannot read object, which is not successfully saved :(", name_replace()); STATE_Read(tNetPacket, size); return TRUE; @@ -380,7 +380,7 @@ xr_token game_types[] = {{"any_game", eGameIDNoGame}, {"single", eGameIDSingle}, {"capture_the_artefact", eGameIDCaptureTheArtefact}, // eGameIDDominationZone // eGameIDTeamDominationZone - {0, 0}}; + {nullptr, 0}}; #ifndef XRGAME_EXPORTS void CSE_Abstract::FillProps(LPCSTR pref, PropItemVec& items) diff --git a/src/xrServerEntities/xrServer_Object_Base.h b/src/xrServerEntities/xrServer_Object_Base.h index 4b8b6160708..e20183dd0d1 100644 --- a/src/xrServerEntities/xrServer_Object_Base.h +++ b/src/xrServerEntities/xrServer_Object_Base.h @@ -122,7 +122,7 @@ class CSE_Abstract : public IServerEntity, public CPureServerObject, public CScr const Fmatrix& /*parent*/, int /*priority*/, bool /*strictB2F*/) { } - virtual visual_data* __stdcall visual_collection() const { return 0; } + virtual visual_data* __stdcall visual_collection() const { return nullptr; } virtual u32 __stdcall visual_collection_size() const { return 0; } virtual void __stdcall set_additional_info(void* /*info*/) {}; #endif // #ifndef XRGAME_EXPORTS @@ -162,23 +162,23 @@ class CSE_Abstract : public IServerEntity, public CPureServerObject, public CScr CInifile& spawn_ini(); // for smart cast - virtual CSE_ALifeGroupAbstract* cast_group_abstract() { return 0; }; - virtual CSE_ALifeSchedulable* cast_schedulable() { return 0; }; - virtual CSE_ALifeInventoryItem* cast_inventory_item() { return 0; }; - virtual CSE_ALifeTraderAbstract* cast_trader_abstract() { return 0; }; - virtual CSE_ALifeObject* cast_alife_object() { return 0; } - virtual CSE_ALifeDynamicObject* cast_alife_dynamic_object() { return 0; } - virtual CSE_ALifeItemAmmo* cast_item_ammo() { return 0; } - virtual CSE_ALifeItemWeapon* cast_item_weapon() { return 0; } - virtual CSE_ALifeItemDetector* cast_item_detector() { return 0; } - virtual CSE_ALifeMonsterAbstract* cast_monster_abstract() { return 0; }; - virtual CSE_ALifeHumanAbstract* cast_human_abstract() { return 0; }; - virtual CSE_ALifeAnomalousZone* cast_anomalous_zone() { return 0; }; - virtual CSE_ALifeTrader* cast_trader() { return 0; }; - virtual CSE_ALifeCreatureAbstract* cast_creature_abstract() { return 0; }; - virtual CSE_ALifeSmartZone* cast_smart_zone() { return 0; }; - virtual CSE_ALifeOnlineOfflineGroup* cast_online_offline_group() { return 0; }; - virtual CSE_ALifeItemPDA* cast_item_pda() { return 0; }; + virtual CSE_ALifeGroupAbstract* cast_group_abstract() { return nullptr; }; + virtual CSE_ALifeSchedulable* cast_schedulable() { return nullptr; }; + virtual CSE_ALifeInventoryItem* cast_inventory_item() { return nullptr; }; + virtual CSE_ALifeTraderAbstract* cast_trader_abstract() { return nullptr; }; + virtual CSE_ALifeObject* cast_alife_object() { return nullptr; } + virtual CSE_ALifeDynamicObject* cast_alife_dynamic_object() { return nullptr; } + virtual CSE_ALifeItemAmmo* cast_item_ammo() { return nullptr; } + virtual CSE_ALifeItemWeapon* cast_item_weapon() { return nullptr; } + virtual CSE_ALifeItemDetector* cast_item_detector() { return nullptr; } + virtual CSE_ALifeMonsterAbstract* cast_monster_abstract() { return nullptr; }; + virtual CSE_ALifeHumanAbstract* cast_human_abstract() { return nullptr; }; + virtual CSE_ALifeAnomalousZone* cast_anomalous_zone() { return nullptr; }; + virtual CSE_ALifeTrader* cast_trader() { return nullptr; }; + virtual CSE_ALifeCreatureAbstract* cast_creature_abstract() { return nullptr; }; + virtual CSE_ALifeSmartZone* cast_smart_zone() { return nullptr; }; + virtual CSE_ALifeOnlineOfflineGroup* cast_online_offline_group() { return nullptr; }; + virtual CSE_ALifeItemPDA* cast_item_pda() { return nullptr; }; }; #pragma warning(pop) diff --git a/src/xrServerEntities/xrServer_Objects.cpp b/src/xrServerEntities/xrServer_Objects.cpp index a1e6cc6e870..ac1a30afdd8 100644 --- a/src/xrServerEntities/xrServer_Objects.cpp +++ b/src/xrServerEntities/xrServer_Objects.cpp @@ -202,7 +202,7 @@ void CSE_PHSkeleton::STATE_Write(NET_Packet& tNetPacket) void CSE_PHSkeleton::data_load(NET_Packet& tNetPacket) { saved_bones.net_Load(tNetPacket); - _flags.set(flSavedData, TRUE); + _flags.set(flSavedData, true); } void CSE_PHSkeleton::data_save(NET_Packet& tNetPacket) diff --git a/src/xrServerEntities/xrServer_Objects.h b/src/xrServerEntities/xrServer_Objects.h index 0c8a9bfeff8..0c22610b56d 100644 --- a/src/xrServerEntities/xrServer_Objects.h +++ b/src/xrServerEntities/xrServer_Objects.h @@ -231,7 +231,7 @@ class CSE_PHSkeleton virtual bool need_save() const throw() { return !_flags.test(flNotSave); } virtual void set_sorce_id(u16 si) { source_id = si; } virtual u16 get_source_id() { return source_id; } - virtual CSE_Abstract* cast_abstract() { return 0; } + virtual CSE_Abstract* cast_abstract() { return nullptr; } protected: virtual void data_load(NET_Packet& tNetPacket); virtual void data_save(NET_Packet& tNetPacket); diff --git a/src/xrServerEntities/xrServer_Objects_ALife.cpp b/src/xrServerEntities/xrServer_Objects_ALife.cpp index f4e82fbb0ef..ed7d4e21890 100644 --- a/src/xrServerEntities/xrServer_Objects_ALife.cpp +++ b/src/xrServerEntities/xrServer_Objects_ALife.cpp @@ -113,7 +113,7 @@ void SFillPropData::load() #ifdef XRGAME_EXPORTS CInifile* Ini = pGameIni; #else // XRGAME_EXPORTS - CInifile* Ini = 0; + CInifile* Ini = nullptr; string_path gm_name; FS.update_path(gm_name, "$game_config$", GAME_CONFIG); R_ASSERT3(FS.exist(gm_name), "Couldn't find file", gm_name); @@ -189,9 +189,11 @@ void SFillPropData::load() #endif // XRGAME_EXPORTS luabind::object table; + R_ASSERT(ai().script_engine().function_object("smart_covers.descriptions", table, LUA_TTABLE)); luabind::object::iterator I = table.begin(); luabind::object::iterator E = table.end(); + for (; I != E; ++I) smart_covers.push_back(luabind::object_cast(I.key())); @@ -352,7 +354,7 @@ void CSE_ALifeGraphPoint::on_render(CDUInterface* du, IServerEntityLEOwner* /*ow du->DrawIndexedPrimitive(4 /*D3DPT_TRIANGLELIST*/, 4, parent.c, PT, 6, IT, 12, C.get()); if (bSelected) - du->DrawSelectionBox(parent.c, Fvector().set(0.5f, 1.0f, 0.5f), NULL); + du->DrawSelectionBox(parent.c, Fvector().set(0.5f, 1.0f, 0.5f), nullptr); #endif // #ifdef XRSE_FACTORY_EXPORTS } @@ -748,7 +750,7 @@ void CSE_ALifeSpaceRestrictor::UPDATE_Write(NET_Packet& tNetPacket) { inherited1 xr_token defaul_retrictor_types[] = {{"NOT A restrictor", RestrictionSpace::eRestrictorTypeNone}, {"NONE default restrictor", RestrictionSpace::eDefaultRestrictorTypeNone}, {"OUT default restrictor", RestrictionSpace::eDefaultRestrictorTypeOut}, -{"IN default restrictor", RestrictionSpace::eDefaultRestrictorTypeIn}, {0, 0}}; +{"IN default restrictor", RestrictionSpace::eDefaultRestrictorTypeIn}, {nullptr, 0}}; #ifndef XRGAME_EXPORTS void CSE_ALifeSpaceRestrictor::FillProps(LPCSTR pref, PropItemVec& items) @@ -860,9 +862,9 @@ CSE_ALifeObjectPhysic::CSE_ALifeObjectPhysic(LPCSTR caSection) if (pSettings->line_exist(caSection, "fixed_bones")) fixed_bones = pSettings->r_string(caSection, "fixed_bones"); - m_flags.set(flUseSwitches, FALSE); - m_flags.set(flSwitchOffline, FALSE); - m_flags.set(flUsedAI_Locations, FALSE); + m_flags.set(flUseSwitches, false); + m_flags.set(flSwitchOffline, false); + m_flags.set(flUsedAI_Locations, false); #ifdef XRGAME_EXPORTS m_freeze_time = Device.dwTimeGlobal; @@ -1129,7 +1131,7 @@ void CSE_ALifeObjectPhysic::load(NET_Packet& tNetPacket) } xr_token po_types[] = { -{"Box", epotBox}, {"Fixed chain", epotFixedChain}, {"Free chain", epotFreeChain}, {"Skeleton", epotSkeleton}, {0, 0}}; +{"Box", epotBox}, {"Fixed chain", epotFixedChain}, {"Free chain", epotFreeChain}, {"Skeleton", epotSkeleton}, {nullptr, 0}}; #ifndef XRGAME_EXPORTS void CSE_ALifeObjectPhysic::FillProps(LPCSTR pref, PropItemVec& values) @@ -1142,7 +1144,7 @@ void CSE_ALifeObjectPhysic::FillProps(LPCSTR pref, PropItemVec& values) PHelper().CreateFlag8(values, PrepareKey(pref, *s_name, "Active"), &_flags, flActive); // motions & bones - PHelper().CreateChoose(values, PrepareKey(pref, *s_name, "Model\\Fixed bones"), &fixed_bones, smSkeletonBones, 0, + PHelper().CreateChoose(values, PrepareKey(pref, *s_name, "Model\\Fixed bones"), &fixed_bones, smSkeletonBones, nullptr, (void*)visual()->get_visual(), 8); } #endif // #ifndef XRGAME_EXPORTS @@ -1321,7 +1323,7 @@ void CSE_ALifeObjectHangingLamp::FillProps(LPCSTR pref, PropItemVec& values) inherited1::FillProps(pref, values); inherited2::FillProps(pref, values); - PropValue* P = 0; + PropValue* P = nullptr; PHelper().CreateFlag16(values, PrepareKey(pref, *s_name, "Flags\\Physic"), &flags, flPhysic); PHelper().CreateFlag16(values, PrepareKey(pref, *s_name, "Flags\\Cast Shadow"), &flags, flCastShadow); PHelper().CreateFlag16(values, PrepareKey(pref, *s_name, "Flags\\Allow R1"), &flags, flR1); @@ -1338,7 +1340,7 @@ void CSE_ALifeObjectHangingLamp::FillProps(LPCSTR pref, PropItemVec& values) PHelper().CreateFloat(values, PrepareKey(pref, *s_name, "Light\\Main\\Virtual Size"), &m_virtual_size, 0.f, 100.f); PHelper().CreateChoose( values, PrepareKey(pref, *s_name, "Light\\Main\\Texture"), &light_texture, smTexture, "lights"); - PHelper().CreateChoose(values, PrepareKey(pref, *s_name, "Light\\Main\\Bone"), &light_main_bone, smSkeletonBones, 0, + PHelper().CreateChoose(values, PrepareKey(pref, *s_name, "Light\\Main\\Bone"), &light_main_bone, smSkeletonBones, nullptr, (void*)visual()->get_visual()); if (flags.is(flTypeSpot)) { @@ -1358,7 +1360,7 @@ void CSE_ALifeObjectHangingLamp::FillProps(LPCSTR pref, PropItemVec& values) PHelper().CreateChoose( values, PrepareKey(pref, *s_name, "Light\\Ambient\\Texture"), &m_ambient_texture, smTexture, "lights"); PHelper().CreateChoose(values, PrepareKey(pref, *s_name, "Light\\Ambient\\Bone"), &light_ambient_bone, - smSkeletonBones, 0, (void*)visual()->get_visual()); + smSkeletonBones, nullptr, (void*)visual()->get_visual()); } if (flags.is(flVolumetric)) @@ -1372,7 +1374,7 @@ void CSE_ALifeObjectHangingLamp::FillProps(LPCSTR pref, PropItemVec& values) } // fixed bones - PHelper().CreateChoose(values, PrepareKey(pref, *s_name, "Model\\Fixed bones"), &fixed_bones, smSkeletonBones, 0, + PHelper().CreateChoose(values, PrepareKey(pref, *s_name, "Model\\Fixed bones"), &fixed_bones, smSkeletonBones, nullptr, (void*)visual()->get_visual(), 8); // glow PHelper().CreateFloat(values, PrepareKey(pref, *s_name, "Glow\\Radius"), &glow_radius, 0.01f, 100.f); @@ -1464,8 +1466,8 @@ bool CSE_ALifeObjectProjector::used_ai_locations() const throw() { return false; CSE_ALifeSchedulable::CSE_ALifeSchedulable(LPCSTR caSection) { - m_tpCurrentBestWeapon = 0; - m_tpBestDetector = 0; + m_tpCurrentBestWeapon = nullptr; + m_tpBestDetector = nullptr; m_schedule_counter = u64(-1); } diff --git a/src/xrServerEntities/xrServer_Objects_ALife.h b/src/xrServerEntities/xrServer_Objects_ALife.h index 5b57f67735c..7e89065a0bf 100644 --- a/src/xrServerEntities/xrServer_Objects_ALife.h +++ b/src/xrServerEntities/xrServer_Objects_ALife.h @@ -66,7 +66,7 @@ class CSE_ALifeSchedulable : public IPureSchedulableObject virtual const CSE_Abstract* base() const = 0; virtual CSE_Abstract* init(); virtual CSE_ALifeSchedulable* cast_schedulable() { return this; }; - virtual CSE_Abstract* cast_abstract() { return 0; }; + virtual CSE_Abstract* cast_abstract() { return nullptr; }; // end of the virtual inheritance dependant code virtual bool need_update(CSE_ALifeDynamicObject* object); virtual u32 ef_creature_type() const; @@ -197,7 +197,7 @@ class CSE_ALifeGroupAbstract virtual CSE_Abstract* base() = 0; virtual const CSE_Abstract* base() const = 0; virtual CSE_ALifeGroupAbstract* cast_group_abstract() { return this; }; - virtual CSE_Abstract* cast_abstract() { return 0; }; + virtual CSE_Abstract* cast_abstract() { return nullptr; }; #ifdef XRGAME_EXPORTS virtual bool synchronize_location(); virtual void try_switch_online(); diff --git a/src/xrServerEntities/xrServer_Objects_ALife_Items.h b/src/xrServerEntities/xrServer_Objects_ALife_Items.h index 7fbab6880a6..a96b6be0ad3 100644 --- a/src/xrServerEntities/xrServer_Objects_ALife_Items.h +++ b/src/xrServerEntities/xrServer_Objects_ALife_Items.h @@ -60,7 +60,7 @@ class CSE_ALifeInventoryItem virtual CSE_Abstract* base() = 0; virtual const CSE_Abstract* base() const = 0; virtual CSE_Abstract* init(); - virtual CSE_Abstract* cast_abstract() { return 0; }; + virtual CSE_Abstract* cast_abstract() { return nullptr; }; virtual CSE_ALifeInventoryItem* cast_inventory_item() { return this; }; virtual u32 update_rate() const; virtual BOOL Net_Relevant(); diff --git a/src/xrServerEntities/xrServer_Objects_ALife_Monsters.cpp b/src/xrServerEntities/xrServer_Objects_ALife_Monsters.cpp index d17c739398e..d0a03ee36a5 100644 --- a/src/xrServerEntities/xrServer_Objects_ALife_Monsters.cpp +++ b/src/xrServerEntities/xrServer_Objects_ALife_Monsters.cpp @@ -129,7 +129,7 @@ CSE_ALifeTraderAbstract::CSE_ALifeTraderAbstract(LPCSTR caSection) m_fMaxItemMass = pSettings->r_float(caSection, "max_item_mass"); m_sCharacterProfile = READ_IF_EXISTS(pSettings, r_string, caSection, "character_profile", "default"); - m_SpecificCharacter = NULL; + m_SpecificCharacter = nullptr; #ifdef XRGAME_EXPORTS m_community_index = NO_COMMUNITY_INDEX; @@ -211,7 +211,7 @@ void CSE_ALifeTraderAbstract::STATE_Read(NET_Packet& tNetPacket, u16 size) if (tmp != -1) m_SpecificCharacter = CSpecificCharacter::IndexToId(tmp); else - m_SpecificCharacter = NULL; + m_SpecificCharacter = nullptr; #else m_SpecificCharacter = NULL; @@ -269,7 +269,7 @@ void CSE_ALifeTraderAbstract::STATE_Read(NET_Packet& tNetPacket, u16 size) void CSE_ALifeTraderAbstract::OnChangeProfile(PropValue* sender) { - m_SpecificCharacter = NULL; + m_SpecificCharacter = nullptr; #ifndef AI_COMPILER specific_character(); #endif @@ -466,7 +466,7 @@ void CSE_ALifeTraderAbstract::set_specific_character(shared_str new_spec_char) } #else //в редакторе специфический профиль оставляем не заполненым - m_SpecificCharacter = NULL; + m_SpecificCharacter = nullptr; #endif } @@ -675,7 +675,7 @@ CSE_ALifeAnomalousZone::CSE_ALifeAnomalousZone(LPCSTR caSection) : CSE_ALifeCust { m_offline_interactive_radius = 30.f; m_artefact_spawn_count = 32; - m_spawn_flags.set(flSpawnDestroyOnSpawn, TRUE); + m_spawn_flags.set(flSpawnDestroyOnSpawn, true); } CSE_Abstract* CSE_ALifeAnomalousZone::init() @@ -831,7 +831,7 @@ void CSE_ALifeZoneVisual::FillProps(LPCSTR pref, PropItemVec& values) IServerEntity* abstract = smart_cast(this); VERIFY(abstract); PHelper().CreateChoose(values, PrepareKey(pref, abstract->name(), "Attack animation"), &attack_animation, - smSkeletonAnims, 0, (void*)*visual_name); + smSkeletonAnims, nullptr, (void*)*visual_name); } #endif // #ifndef XRGAME_EXPORTS //------------------------------------------------------------------------- @@ -1051,7 +1051,7 @@ CSE_ALifeMonsterAbstract::CSE_ALifeMonsterAbstract(LPCSTR caSection) m_tpBestDetector = this; - m_brain = 0; + m_brain = nullptr; m_smart_terrain_id = 0xffff; m_task_reached = false; @@ -1154,9 +1154,9 @@ void CSE_ALifeMonsterAbstract::FillProps(LPCSTR pref, PropItemVec& items) { LPCSTR gcs = pSettings->r_string(s_name, "SpaceRestrictionSection"); PHelper().CreateChoose(items, PrepareKey(pref, *s_name, "out space restrictions"), &m_out_space_restrictors, - smSpawnItem, 0, (void*)gcs, 16); + smSpawnItem, nullptr, (void*)gcs, 16); PHelper().CreateChoose(items, PrepareKey(pref, *s_name, "in space restrictions"), &m_in_space_restrictors, - smSpawnItem, 0, (void*)gcs, 16); + smSpawnItem, nullptr, (void*)gcs, 16); } } #endif // #ifndef XRGAME_EXPORTS @@ -1302,14 +1302,14 @@ void CSE_ALifeCreatureActor::UPDATE_Read(NET_Packet& tNetPacket) tNetPacket.r_float(m_AliveState.quaternion.w); return; - }; + } ////////////// Import dead body //////////////////// Msg("A mi ni hera tut ne chitaem (m_u16NumItems == %d)", m_u16NumItems); { m_BoneDataSize = tNetPacket.r_u8(); u32 BodyDataSize = 24 + m_BoneDataSize * m_u16NumItems; tNetPacket.r(m_DeadBodyData, BodyDataSize); - }; + } }; void CSE_ALifeCreatureActor::UPDATE_Write(NET_Packet& tNetPacket) { @@ -1343,13 +1343,13 @@ void CSE_ALifeCreatureActor::UPDATE_Write(NET_Packet& tNetPacket) tNetPacket.w_float(m_AliveState.quaternion.w); return; - }; + } ////////////// Export dead body //////////////////// { tNetPacket.w_u8(m_BoneDataSize); u32 BodyDataSize = 24 + m_BoneDataSize * m_u16NumItems; tNetPacket.w(m_DeadBodyData, BodyDataSize); - }; + } } #ifndef XRGAME_EXPORTS @@ -1921,7 +1921,7 @@ void CSE_ALifeOnlineOfflineGroup::STATE_Read(NET_Packet& tNetPacket, u16 size) { MEMBERS::value_type pair; load_data(pair.first, tNetPacket); - pair.second = 0; + pair.second = nullptr; m_members.insert(pair); } #endif diff --git a/src/xrServerEntities/xrServer_Objects_ALife_Monsters.h b/src/xrServerEntities/xrServer_Objects_ALife_Monsters.h index 7c1f6f570be..7897d02e6bd 100644 --- a/src/xrServerEntities/xrServer_Objects_ALife_Monsters.h +++ b/src/xrServerEntities/xrServer_Objects_ALife_Monsters.h @@ -80,7 +80,7 @@ class CSE_ALifeTraderAbstract virtual CSE_Abstract* base() = 0; virtual const CSE_Abstract* base() const = 0; virtual CSE_Abstract* init(); - virtual CSE_Abstract* cast_abstract() { return 0; }; + virtual CSE_Abstract* cast_abstract() { return nullptr; }; virtual CSE_ALifeTraderAbstract* cast_trader_abstract() { return this; }; // end of the virtual inheritance dependant code void __stdcall OnChangeProfile(PropValue* sender); diff --git a/src/xrServerEntities/xrServer_Objects_Abstract.cpp b/src/xrServerEntities/xrServer_Objects_Abstract.cpp index 8a6f2eeb31c..1d38078aff0 100644 --- a/src/xrServerEntities/xrServer_Objects_Abstract.cpp +++ b/src/xrServerEntities/xrServer_Objects_Abstract.cpp @@ -28,7 +28,7 @@ CSE_Visual::CSE_Visual(LPCSTR name) visual_name = tmp; } else - visual_name = NULL; + visual_name = nullptr; startup_animation = "$editor"; flags.zero(); @@ -81,7 +81,7 @@ void CSE_Visual::FillProps(LPCSTR pref, PropItemVec& items) PHelper().CreateChoose(items, PrepareKey(pref, abstract->name(), "Model\\Visual"), &visual_name, smVisual); V->OnChangeEvent.bind(this, &CSE_Visual::OnChangeVisual); V = PHelper().CreateChoose(items, PrepareKey(pref, abstract->name(), "Model\\Animation"), &startup_animation, - smSkeletonAnims, 0, (void*)*visual_name); + smSkeletonAnims, nullptr, (void*)*visual_name); V->OnChangeEvent.bind(this, &CSE_Visual::OnChangeAnim); PHelper().CreateFlag8(items, PrepareKey(pref, abstract->name(), "Model\\Obstacle"), &flags, flObstacle); } diff --git a/src/xrServerEntities/xrServer_Objects_Abstract.h b/src/xrServerEntities/xrServer_Objects_Abstract.h index f26be942a1b..7da622190c2 100644 --- a/src/xrServerEntities/xrServer_Objects_Abstract.h +++ b/src/xrServerEntities/xrServer_Objects_Abstract.h @@ -53,7 +53,7 @@ class CSE_Visual Flags8 flags; public: - CSE_Visual(LPCSTR name = 0); + CSE_Visual(LPCSTR name = nullptr); virtual ~CSE_Visual(); void visual_read(NET_Packet& P, u16 version); @@ -77,7 +77,7 @@ class CSE_Motion shared_str motion_name; public: - CSE_Motion(LPCSTR name = 0); + CSE_Motion(LPCSTR name = nullptr); virtual ~CSE_Motion(); void motion_read(NET_Packet& P); @@ -124,7 +124,7 @@ class IServerEntity virtual ~IServerEntity() = 0; // XXX: move to implementation Flags32 m_editor_flags; - void set_editor_flag(u32 mask) { m_editor_flags.set(mask, TRUE); } + void set_editor_flag(u32 mask) { m_editor_flags.set(mask, true); } public: virtual void __stdcall Spawn_Write(NET_Packet& tNetPacket, BOOL bLocal) = 0; virtual BOOL __stdcall Spawn_Read(NET_Packet& tNetPacket) = 0; diff --git a/src/xrServerEntities/xrServer_Objects_Alife_Smartcovers.cpp b/src/xrServerEntities/xrServer_Objects_Alife_Smartcovers.cpp index 33cf757a0c9..831e4afecd6 100644 --- a/src/xrServerEntities/xrServer_Objects_Alife_Smartcovers.cpp +++ b/src/xrServerEntities/xrServer_Objects_Alife_Smartcovers.cpp @@ -515,7 +515,7 @@ void CSE_SmartCover::on_render( if (m_need_to_reparse_loopholes && m_description.size()) { - OnChangeDescription(NULL); + OnChangeDescription(nullptr); m_need_to_reparse_loopholes = false; }