Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor condition tests in shadow related code #1102

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Refactor condition tests in shadow related code #1102

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/platform/w3dengine/client/shadow/w3dbuffermanager.cpp
View file
Original file line number Diff line number Diff line change
@@ -258,7 +258,7 @@ W3DBufferManager::W3DVertexBufferSlot *W3DBufferManager::Get_Slot(VBM_FVF_TYPES
size = (size + 31) & ~31;
int size_index = (size / 32) - 1;

captainslog_dbgassert(size_index < MAX_IB_SIZES && size, "Allocating too large vertex buffer slot");
captainslog_dbgassert(size_index < MAX_VB_SIZES && size != 0, "Allocating too large vertex buffer slot");

W3DVertexBufferSlot *vb_slot = m_W3DVertexBufferSlots[fvf_type][size_index];

@@ -364,7 +364,7 @@ W3DBufferManager::W3DIndexBufferSlot *W3DBufferManager::Get_Slot(int size)
size = (size + 31) & ~31;
int size_index = (size / 32) - 1;

captainslog_dbgassert(size_index < MAX_IB_SIZES && size, "Allocating too large index buffer slot");
captainslog_dbgassert(size_index < MAX_IB_SIZES && size != 0, "Allocating too large index buffer slot");

W3DIndexBufferSlot *ib_slot = m_W3DIndexBufferSlots[size_index];

27 changes: 14 additions & 13 deletions src/platform/w3dengine/client/shadow/w3dprojectedshadow.cpp
View file
Original file line number Diff line number Diff line change
@@ -306,7 +306,7 @@ W3DProjectedShadow::W3DProjectedShadow()

void W3DProjectedShadow::Init()
{
captainslog_dbgassert(!m_shadowProjector, "Init of existing shadow projector");
captainslog_dbgassert(m_shadowProjector == nullptr, "Init of existing shadow projector");

if (m_type == SHADOW_PROJECTION) {
m_shadowProjector = new TexProjectClass();
@@ -459,14 +459,14 @@ W3DProjectedShadowManager::~W3DProjectedShadowManager()

m_W3DShadowTextureManager = nullptr;

captainslog_dbgassert(!m_shadowList, "Destroy of non-empty projected shadow list");
captainslog_dbgassert(!m_decalList, "Destroy of non-empty projected decal list");
captainslog_dbgassert(m_shadowList == nullptr, "Destroy of non-empty projected shadow list");
captainslog_dbgassert(m_decalList == nullptr, "Destroy of non-empty projected decal list");
}

void W3DProjectedShadowManager::Reset()
{
captainslog_dbgassert(!m_shadowList, "Reset of non-empty projected shadow list");
captainslog_dbgassert(!m_decalList, "Reset of non-empty projected decal list");
captainslog_dbgassert(m_shadowList == nullptr, "Reset of non-empty projected shadow list");
captainslog_dbgassert(m_decalList == nullptr, "Reset of non-empty projected decal list");
m_W3DShadowTextureManager->Free_All_Textures();
}

@@ -482,7 +482,7 @@ bool W3DProjectedShadowManager::Init()
bool W3DProjectedShadowManager::Re_Acquire_Resources()
{
#ifdef BUILD_WITH_D3D8
captainslog_dbgassert(!m_dynamicRenderTarget, "Acquire of existing shadow render target");
captainslog_dbgassert(m_dynamicRenderTarget == nullptr, "Acquire of existing shadow render target");

m_renderTargetHasAlpha = true;
m_dynamicRenderTarget = DX8Wrapper::Create_Render_Target(512, 512, WW3D_FORMAT_A8R8G8B8);
@@ -493,8 +493,9 @@ bool W3DProjectedShadowManager::Re_Acquire_Resources()
}

IDirect3DDevice8 *dev = DX8Wrapper::Get_D3D_Device8();
captainslog_dbgassert(dev, "Trying to ReAquireResources on W3DProjectedShadowManager without device");
captainslog_dbgassert(!g_shadowDecalIndexBufferD3D, "ReAquireResources not released in W3DProjectedShadowManager");
captainslog_dbgassert(dev != nullptr, "Trying to ReAquireResources on W3DProjectedShadowManager without device");
captainslog_dbgassert(
g_shadowDecalIndexBufferD3D == nullptr, "ReAquireResources not released in W3DProjectedShadowManager");

if (FAILED(dev->CreateIndexBuffer(2 * g_shadowDecalIndexSize,
D3DUSAGE_WRITEONLY | D3DUSAGE_DYNAMIC,
@@ -1269,7 +1270,7 @@ Shadow *W3DProjectedShadowManager::Add_Decal(Shadow::ShadowTypeInfo *shadow_info
strcpy(&fname[len], ".tga");
tex = m_W3DShadowTextureManager->Get_Texture(fname);

if (!tex) {
if (tex == nullptr) {
TextureClass *t = W3DAssetManager::Get_Instance()->Get_Texture(fname);
t->Get_Texture_Filter()->Set_U_Address_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
t->Get_Texture_Filter()->Set_V_Address_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
@@ -1362,7 +1363,7 @@ Shadow *W3DProjectedShadowManager::Add_Decal(RenderObjClass *robj, Shadow::Shado
strcpy(&fname[len], ".tga");
tex = m_W3DShadowTextureManager->Get_Texture(fname);

if (!tex) {
if (tex == nullptr) {
TextureClass *t = W3DAssetManager::Get_Instance()->Get_Texture(fname);
t->Get_Texture_Filter()->Set_U_Address_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
t->Get_Texture_Filter()->Set_V_Address_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
@@ -1490,7 +1491,7 @@ W3DProjectedShadow *W3DProjectedShadowManager::Add_Shadow(

tex = m_W3DShadowTextureManager->Get_Texture(fname);

if (!tex) {
if (tex == nullptr) {
TextureClass *t = W3DAssetManager::Get_Instance()->Get_Texture(fname);
t->Get_Texture_Filter()->Set_U_Address_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
t->Get_Texture_Filter()->Set_V_Address_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
@@ -1524,7 +1525,7 @@ W3DProjectedShadow *W3DProjectedShadowManager::Add_Shadow(

tex = m_W3DShadowTextureManager->Get_Texture(fname);

if (!tex) {
if (tex == nullptr) {
m_W3DShadowTextureManager->Create_Texture(robj, fname);
tex = m_W3DShadowTextureManager->Get_Texture(fname);
captainslog_dbgassert(tex, "Could not create shadow texture");
@@ -1647,7 +1648,7 @@ W3DProjectedShadow *W3DProjectedShadowManager::Create_Decal_Shadow(Shadow::Shado

tex = m_W3DShadowTextureManager->Get_Texture(fname);

if (!tex) {
if (tex == nullptr) {
TextureClass *t = W3DAssetManager::Get_Instance()->Get_Texture(fname);
t->Get_Texture_Filter()->Set_U_Address_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
t->Get_Texture_Filter()->Set_V_Address_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
6 changes: 3 additions & 3 deletions src/platform/w3dengine/client/shadow/w3dvolumetricshadow.cpp
View file
Original file line number Diff line number Diff line change
@@ -371,7 +371,7 @@ int W3DShadowGeometry::Init_From_HLOD(RenderObjClass *robj)

if (lod_model != nullptr) {
if (lod_model->Class_ID() == RenderObjClass::CLASSID_SHDMESH) {
captainslog_dbgassert(0, "Meshes using shaders are not supported! How did you end up here!?");
captainslog_dbgassert(false, "Meshes using shaders are not supported! How did you end up here!?");
}
}
}
@@ -611,7 +611,7 @@ bool W3DVolumetricShadowManager::Re_Acquire_Resources()
Release_Resources();
#ifdef BUILD_WITH_D3D8
IDirect3DDevice8 *device = DX8Wrapper::Get_D3D_Device8();
captainslog_dbgassert(device, "Trying to Re_Acquire_Resources on W3DVolumetricShadowManager without device");
captainslog_dbgassert(device != nullptr, "Trying to Re_Acquire_Resources on W3DVolumetricShadowManager without device");

if (FAILED(device->CreateIndexBuffer(sizeof(unsigned short) * SHADOW_INDEX_SIZE,
D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY,
@@ -621,7 +621,7 @@ bool W3DVolumetricShadowManager::Re_Acquire_Resources()
return false;
}

if (!g_shadowVertexBufferD3D
if (g_shadowVertexBufferD3D == nullptr
&& FAILED(device->CreateVertexBuffer(sizeof(Vector3) * SHADOW_VERTEX_SIZE,
D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY,
0,
2 changes: 1 addition & 1 deletion src/w3d/renderer/dx8fvf.cpp
View file
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ FVFInfoClass::FVFInfoClass(unsigned int fvf_, unsigned int fvf_size_)
#ifdef BUILD_WITH_D3D8
m_FVF = fvf_;

if (fvf_) {
if (fvf_ != 0) {
m_fvfSize = Get_FVF_Vertex_Size(m_FVF);
} else {
m_fvfSize = fvf_size_;
34 changes: 17 additions & 17 deletions src/w3d/renderer/dx8vertexbuffer.cpp
View file
Original file line number Diff line number Diff line change
@@ -32,10 +32,10 @@ unsigned short g_dynamicDX8VertexBufferSize = 5000;
unsigned short g_dynamicDX8VertexBufferOffset;

VertexBufferClass::VertexBufferClass(
unsigned int type_, unsigned int fvf, unsigned short vertex_count_, unsigned int vertex_size) :
m_type(type_), m_vertexCount(vertex_count_), m_engineRefs(0)
unsigned int type_, unsigned int fvf, unsigned short vertex_count, unsigned int vertex_size) :
m_type(type_), m_vertexCount(vertex_count), m_engineRefs(0)
{
captainslog_assert(m_vertexCount);
captainslog_assert(m_vertexCount != 0);
captainslog_assert(m_type == BUFFER_TYPE_DX8 || m_type == BUFFER_TYPE_SORTING);
captainslog_assert((fvf != 0 && vertex_size == 0) || (fvf == 0 && vertex_size != 0));
m_fvfInfo = new FVFInfoClass(fvf, vertex_size);
@@ -50,7 +50,7 @@ VertexBufferClass::~VertexBufferClass()
g_vertexBufferTotalVertices -= m_vertexCount;
g_vertexBufferTotalSize -= m_vertexCount * m_fvfInfo->Get_FVF_Size();

if (m_fvfInfo) {
if (m_fvfInfo != nullptr) {
delete m_fvfInfo;
}
}
@@ -85,7 +85,7 @@ VertexBufferClass::WriteLockClass::WriteLockClass(VertexBufferClass *vertex_buff
VertexBufferLockClass(vertex_buffer)
{
captainslog_assert(vertex_buffer);
captainslog_assert(!vertex_buffer->Engine_Refs());
captainslog_assert(vertex_buffer->Engine_Refs() == 0);
vertex_buffer->Add_Ref();

switch (vertex_buffer->Type()) {
@@ -102,7 +102,7 @@ VertexBufferClass::WriteLockClass::WriteLockClass(VertexBufferClass *vertex_buff
break;
}
default:
captainslog_assert(0);
captainslog_assert(false);
break;
}
}
@@ -119,7 +119,7 @@ VertexBufferClass::WriteLockClass::~WriteLockClass()
case BUFFER_TYPE_SORTING:
break;
default:
captainslog_assert(0);
captainslog_assert(false);
break;
}

@@ -131,7 +131,7 @@ VertexBufferClass::AppendLockClass::AppendLockClass(
VertexBufferLockClass(vertex_buffer)
{
captainslog_assert(vertex_buffer);
captainslog_assert(!vertex_buffer->Engine_Refs());
captainslog_assert(vertex_buffer->Engine_Refs() == 0);
captainslog_assert(start_index + index_range <= vertex_buffer->Get_Vertex_Count());
vertex_buffer->Add_Ref();

@@ -152,7 +152,7 @@ VertexBufferClass::AppendLockClass::AppendLockClass(
break;
}
default:
captainslog_assert(0);
captainslog_assert(false);
break;
}
}
@@ -169,7 +169,7 @@ VertexBufferClass::AppendLockClass::~AppendLockClass()
case BUFFER_TYPE_SORTING:
break;
default:
captainslog_assert(0);
captainslog_assert(false);
break;
}

@@ -188,8 +188,8 @@ SortingVertexBufferClass::~SortingVertexBufferClass()
}

DX8VertexBufferClass::DX8VertexBufferClass(
unsigned int fvf, unsigned short vertex_count_, UsageType usage, unsigned int flags) :
VertexBufferClass(BUFFER_TYPE_DX8, fvf, vertex_count_, flags)
unsigned int fvf, unsigned short vertex_count, UsageType usage, unsigned int vertex_size) :
VertexBufferClass(BUFFER_TYPE_DX8, fvf, vertex_count, vertex_size)
#ifdef BUILD_WITH_D3D8
,
m_vertexBuffer(nullptr)
@@ -208,7 +208,7 @@ DX8VertexBufferClass::~DX8VertexBufferClass()
void DX8VertexBufferClass::Create_Vertex_Buffer(UsageType usage)
{
#ifdef BUILD_WITH_D3D8
captainslog_assert(!m_vertexBuffer);
captainslog_assert(m_vertexBuffer == nullptr);
int d3dusage = ((usage & USAGE_DYNAMIC) < 1 ? D3DUSAGE_WRITEONLY : D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY)
| ((usage & USAGE_SOFTWAREPROCESSING) >= 1 ? D3DUSAGE_SOFTWAREPROCESSING : 0);

@@ -269,7 +269,7 @@ DynamicVBAccessClass::~DynamicVBAccessClass()

void DynamicVBAccessClass::Deinit()
{
if (g_dynamicDX8VertexBuffer) {
if (g_dynamicDX8VertexBuffer != nullptr) {
captainslog_assert((g_dynamicDX8VertexBuffer == NULL) || (g_dynamicDX8VertexBuffer->Num_Refs() == 1));
g_dynamicDX8VertexBuffer->Release_Ref();
}
@@ -279,7 +279,7 @@ void DynamicVBAccessClass::Deinit()
g_dynamicDX8VertexBufferSize = 5000;
g_dynamicDX8VertexBufferOffset = 0;

if (g_dynamicSortingVertexArray) {
if (g_dynamicSortingVertexArray != nullptr) {
captainslog_assert((g_dynamicSortingVertexArray == NULL) || (g_dynamicSortingVertexArray->Num_Refs() == 1));
g_dynamicSortingVertexArray->Release_Ref();
}
@@ -304,7 +304,7 @@ void DynamicVBAccessClass::Allocate_DX8_Dynamic_Buffer()
}
}

if (!g_dynamicDX8VertexBuffer) {
if (g_dynamicDX8VertexBuffer == nullptr) {
DX8VertexBufferClass::UsageType usage = DX8VertexBufferClass::USAGE_DYNAMIC;
g_dynamicDX8VertexBuffer = new DX8VertexBufferClass(DX8_FVF_XYZNDUV2, g_dynamicDX8VertexBufferSize, usage, 0);
g_dynamicDX8VertexBufferOffset = 0;
@@ -335,7 +335,7 @@ void DynamicVBAccessClass::Allocate_Sorting_Dynamic_Buffer()
}
}

if (!g_dynamicSortingVertexArray) {
if (g_dynamicSortingVertexArray == nullptr) {
g_dynamicSortingVertexArray = new SortingVertexBufferClass(g_dynamicSortingVertexArraySize);
g_dynamicSortingVertexArrayOffset = 0;
}
4 changes: 2 additions & 2 deletions src/w3d/renderer/dx8vertexbuffer.h
View file
Original file line number Diff line number Diff line change
@@ -119,7 +119,7 @@ class VertexBufferClass : public W3DMPO, public RefCountClass
};

public:
VertexBufferClass(unsigned int type_, unsigned int fvf, unsigned short vertex_count_, unsigned int vertex_size);
VertexBufferClass(unsigned int type_, unsigned int fvf, unsigned short vertex_count, unsigned int vertex_size);
~VertexBufferClass();
void Add_Engine_Ref() const;
void Release_Engine_Ref();
@@ -149,7 +149,7 @@ class DX8VertexBufferClass : public VertexBufferClass
USAGE_DYNAMIC = 1,
USAGE_SOFTWAREPROCESSING = 2,
};
DX8VertexBufferClass(unsigned int fvf, unsigned short vertex_count_, UsageType usage, unsigned int flags);
DX8VertexBufferClass(unsigned int fvf, unsigned short vertex_count, UsageType usage, unsigned int vertex_size);
DX8VertexBufferClass(
Vector3 *vertices, Vector3 *normals, Vector2 *tex_coords, unsigned short VertexCount, UsageType usage);
DX8VertexBufferClass(Vector3 *vertices, Vector2 *tex_coords, unsigned short VertexCount, UsageType usage);