nick/WickedEngine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removed some macro use

Browse Source
This commit is contained in:
Turanszki Janos
2020-03-07 19:25:30 +00:00
parent d95dfa7ef2
commit c9c03b2d48
25 changed files with 60 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/AnimationWindow.cpp
+1 -1
View File
@@ -99,7 +99,7 @@ AnimationWindow::~AnimationWindow()
animWindow->RemoveWidgets(true);
GUI->RemoveWidget(animWindow);
SAFE_DELETE(animWindow);
delete animWindow;
}
void AnimationWindow::Update()
Editor/CameraWindow.cpp
+1 -1
View File
@@ -146,7 +146,7 @@ CameraWindow::~CameraWindow()
{
cameraWindow->RemoveWidgets(true);
GUI->RemoveWidget(cameraWindow);
SAFE_DELETE(cameraWindow);
delete cameraWindow;
}
void CameraWindow::SetEntity(Entity entity)
Editor/DecalWindow.cpp
+1 -1
View File
@@ -39,7 +39,7 @@ DecalWindow::~DecalWindow()
{
decalWindow->RemoveWidgets(true);
GUI->RemoveWidget(decalWindow);
SAFE_DELETE(decalWindow);
delete decalWindow;
}
void DecalWindow::SetEntity(Entity entity)
Editor/EmitterWindow.cpp
+1 -1
View File
@@ -424,7 +424,7 @@ EmitterWindow::~EmitterWindow()
{
emitterWindow->RemoveWidgets(true);
GUI->RemoveWidget(emitterWindow);
SAFE_DELETE(emitterWindow);
delete emitterWindow;
}
void EmitterWindow::SetEntity(Entity entity)
Editor/EnvProbeWindow.cpp
+1 -1
View File
@@ -75,7 +75,7 @@ EnvProbeWindow::~EnvProbeWindow()
{
envProbeWindow->RemoveWidgets(true);
GUI->RemoveWidget(envProbeWindow);
SAFE_DELETE(envProbeWindow);
delete envProbeWindow;
}
void EnvProbeWindow::SetEntity(Entity entity)
Editor/ForceFieldWindow.cpp
+1 -1
View File
@@ -118,7 +118,7 @@ ForceFieldWindow::~ForceFieldWindow()
{
forceFieldWindow->RemoveWidgets(true);
GUI->RemoveWidget(forceFieldWindow);
SAFE_DELETE(forceFieldWindow);
delete forceFieldWindow;
}
void ForceFieldWindow::SetEntity(Entity entity)
Editor/HairParticleWindow.cpp
+1 -1
View File
@@ -159,7 +159,7 @@ HairParticleWindow::~HairParticleWindow()
{
hairWindow->RemoveWidgets(true);
GUI->RemoveWidget(hairWindow);
SAFE_DELETE(hairWindow);
delete hairWindow;
}
void HairParticleWindow::SetEntity(Entity entity)
Editor/LightWindow.cpp
+1 -1
View File
@@ -295,7 +295,7 @@ LightWindow::~LightWindow()
{
lightWindow->RemoveWidgets(true);
GUI->RemoveWidget(lightWindow);
SAFE_DELETE(lightWindow);
delete lightWindow;
}
void LightWindow::SetEntity(Entity entity)
Editor/MaterialWindow.cpp
+1 -1
View File
@@ -760,7 +760,7 @@ MaterialWindow::~MaterialWindow()
{
materialWindow->RemoveWidgets(true);
GUI->RemoveWidget(materialWindow);
SAFE_DELETE(materialWindow);
delete materialWindow;
}
Editor/MeshWindow.cpp
+1 -1
View File
@@ -231,7 +231,7 @@ MeshWindow::~MeshWindow()
{
meshWindow->RemoveWidgets(true);
GUI->RemoveWidget(meshWindow);
SAFE_DELETE(meshWindow);
delete meshWindow;
}
void MeshWindow::SetEntity(Entity entity)
Editor/ObjectWindow.cpp
+1 -1
View File
@@ -581,7 +581,7 @@ ObjectWindow::~ObjectWindow()
{
objectWindow->RemoveWidgets(true);
GUI->RemoveWidget(objectWindow);
SAFE_DELETE(objectWindow);
delete objectWindow;
}
Editor/PostprocessWindow.cpp
+1 -1
View File
@@ -342,5 +342,5 @@ PostprocessWindow::~PostprocessWindow()
{
ppWindow->RemoveWidgets(true);
GUI->RemoveWidget(ppWindow);
SAFE_DELETE(ppWindow);
delete ppWindow;
}
Editor/RendererWindow.cpp
+1 -1
View File
@@ -570,7 +570,7 @@ RendererWindow::~RendererWindow()
{
rendererWindow->RemoveWidgets(true);
GUI->RemoveWidget(rendererWindow);
SAFE_DELETE(rendererWindow);
delete rendererWindow;
}
UINT RendererWindow::GetPickType()
Editor/SoundWindow.cpp
+1 -1
View File
@@ -162,7 +162,7 @@ SoundWindow::~SoundWindow()
{
soundWindow->RemoveWidgets(true);
GUI->RemoveWidget(soundWindow);
SAFE_DELETE(soundWindow);
delete soundWindow;
}
Editor/WeatherWindow.cpp
+1 -1
View File
@@ -453,7 +453,7 @@ WeatherWindow::~WeatherWindow()
{
weatherWindow->RemoveWidgets(true);
GUI->RemoveWidget(weatherWindow);
SAFE_DELETE(weatherWindow);
delete weatherWindow;
}
void WeatherWindow::Update()
WickedEngine/CommonInclude.h
+4 -8
View File
@@ -10,14 +10,10 @@
#include <DirectXPackedVector.h>
using namespace DirectX;
using namespace DirectX::PackedVector;
#define arraysize(a) (sizeof(a) / sizeof(a[0]))
#define ALIGN_16 void* operator new(size_t i){return _mm_malloc(i, 16);} void operator delete(void* p){_mm_free(p);}
#define SAFE_DELETE(a) {delete (a);(a)=nullptr;}
#define SAFE_DELETE_ARRAY(a) {delete[](a);(a)=nullptr;}
#define GFX_STRUCT struct alignas(16)
#define NOMINMAX
static const XMFLOAT4X4 IDENTITYMATRIX = XMFLOAT4X4(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
#define arraysize(a) (sizeof(a) / sizeof(a[0]))
#define NOMINMAX
#define ALIGN_16 void* operator new(size_t i){return _mm_malloc(i, 16);} void operator delete(void* p){_mm_free(p);}
#endif //WICKEDENGINE_COMMONINCLUDE_H
WickedEngine/wiEmittedParticle.cpp
+3 -7
View File
@@ -91,14 +91,10 @@ void wiEmittedParticle::CreateSelfBuffers()
// Distance buffer:
bd.StructureByteStride = sizeof(float);
bd.ByteWidth = bd.StructureByteStride * MAX_PARTICLES;
float* distances = new float[MAX_PARTICLES];
for (uint32_t i = 0; i < MAX_PARTICLES; ++i)
{
distances[i] = 0;
}
data.pSysMem = distances;
std::vector<float> distances(MAX_PARTICLES);
std::fill(distances.begin(), distances.end(), 0.0f);
data.pSysMem = distances.data();
wiRenderer::GetDevice()->CreateBuffer(&bd, &data, &distanceBuffer);
SAFE_DELETE_ARRAY(distances);
data.pSysMem = nullptr;
// SPH Partitioning grid indices per particle:
WickedEngine/wiGraphicsDevice_DX12.cpp
+14 -24
View File
@@ -1073,7 +1073,7 @@ using namespace DX12_Internal;
}
GraphicsDevice_DX12::DescriptorAllocator::~DescriptorAllocator()
{
SAFE_DELETE_ARRAY(itemsAlive);
delete[] itemsAlive;
}
D3D12_CPU_DESCRIPTOR_HANDLE GraphicsDevice_DX12::DescriptorAllocator::allocate()
{
@@ -1790,8 +1790,8 @@ using namespace DX12_Internal;
samplerRange.OffsetInDescriptorsFromTableStart = D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND;
{
uint32_t descriptorRangeCount = 3;
D3D12_DESCRIPTOR_RANGE* descriptorRanges = new D3D12_DESCRIPTOR_RANGE[descriptorRangeCount];
const uint32_t descriptorRangeCount = 3;
D3D12_DESCRIPTOR_RANGE descriptorRanges[descriptorRangeCount];
descriptorRanges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_CBV;
descriptorRanges[0].BaseShaderRegister = 0;
@@ -1814,8 +1814,8 @@ using namespace DX12_Internal;
uint32_t paramCount = 2 * (SHADERSTAGE_COUNT - 1); // 2: resource,sampler; 5: vs,hs,ds,gs,ps;
D3D12_ROOT_PARAMETER* params = new D3D12_ROOT_PARAMETER[paramCount];
const uint32_t paramCount = 2 * (SHADERSTAGE_COUNT - 1); // 2: resource,sampler; 5: vs,hs,ds,gs,ps;
D3D12_ROOT_PARAMETER params[paramCount] = {};
params[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
params[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_VERTEX;
params[0].DescriptorTable.NumDescriptorRanges = descriptorRangeCount;
@@ -1884,13 +1884,10 @@ using namespace DX12_Internal;
}
hr = device->CreateRootSignature(0, rootSigBlob->GetBufferPointer(), rootSigBlob->GetBufferSize(), IID_PPV_ARGS(&graphicsRootSig));
assert(SUCCEEDED(hr));
SAFE_DELETE_ARRAY(descriptorRanges);
SAFE_DELETE_ARRAY(params);
}
{
uint32_t descriptorRangeCount = 3;
D3D12_DESCRIPTOR_RANGE* descriptorRanges = new D3D12_DESCRIPTOR_RANGE[descriptorRangeCount];
const uint32_t descriptorRangeCount = 3;
D3D12_DESCRIPTOR_RANGE descriptorRanges[descriptorRangeCount];
descriptorRanges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_CBV;
descriptorRanges[0].BaseShaderRegister = 0;
@@ -1912,8 +1909,8 @@ using namespace DX12_Internal;
uint32_t paramCount = 2;
D3D12_ROOT_PARAMETER* params = new D3D12_ROOT_PARAMETER[paramCount];
const uint32_t paramCount = 2;
D3D12_ROOT_PARAMETER params[paramCount];
params[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE;
params[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL;
params[0].DescriptorTable.NumDescriptorRanges = descriptorRangeCount;
@@ -1942,9 +1939,6 @@ using namespace DX12_Internal;
}
hr = device->CreateRootSignature(0, rootSigBlob->GetBufferPointer(), rootSigBlob->GetBufferSize(), IID_PPV_ARGS(&computeRootSig));
assert(SUCCEEDED(hr));
SAFE_DELETE_ARRAY(descriptorRanges);
SAFE_DELETE_ARRAY(params);
}
@@ -2355,7 +2349,7 @@ using namespace DX12_Internal;
if (pInitialData != nullptr)
{
uint32_t dataCount = pDesc->ArraySize * std::max(1u, pDesc->MipLevels);
D3D12_SUBRESOURCE_DATA* data = new D3D12_SUBRESOURCE_DATA[dataCount];
std::vector<D3D12_SUBRESOURCE_DATA> data(dataCount);
for (uint32_t slice = 0; slice < dataCount; ++slice)
{
data[slice] = _ConvertSubresourceData(pInitialData[slice]);
@@ -2372,11 +2366,9 @@ using namespace DX12_Internal;
uint8_t* dest = textureUploader.allocate(static_cast<size_t>(RequiredSize), D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT);
UINT64 dataSize = UpdateSubresources(static_cast<ID3D12GraphicsCommandList*>(copyCommandList.Get()), internal_state->resource.Get(),
textureUploader.resource.Get(), textureUploader.calculateOffset(dest), 0, dataCount, data);
textureUploader.resource.Get(), textureUploader.calculateOffset(dest), 0, dataCount, data.data());
}
copyQueueLock.unlock();
SAFE_DELETE_ARRAY(data);
}
if (pTexture->desc.BindFlags & BIND_RENDER_TARGET)
@@ -3647,11 +3639,11 @@ using namespace DX12_Internal;
desc.BlendState.RenderTarget[i].RenderTargetWriteMask = _ParseColorWriteMask(pBlendStateDesc.RenderTarget[i].RenderTargetWriteMask);
}
D3D12_INPUT_ELEMENT_DESC* elements = nullptr;
std::vector<D3D12_INPUT_ELEMENT_DESC> elements;
if (pso->desc.il != nullptr)
{
desc.InputLayout.NumElements = (uint32_t)pso->desc.il->desc.size();
elements = new D3D12_INPUT_ELEMENT_DESC[desc.InputLayout.NumElements];
elements.resize(desc.InputLayout.NumElements);
for (uint32_t i = 0; i < desc.InputLayout.NumElements; ++i)
{
elements[i].SemanticName = pso->desc.il->desc[i].SemanticName;
@@ -3665,7 +3657,7 @@ using namespace DX12_Internal;
elements[i].InstanceDataStepRate = pso->desc.il->desc[i].InstanceDataStepRate;
}
}
desc.InputLayout.pInputElementDescs = elements;
desc.InputLayout.pInputElementDescs = elements.data();
desc.NumRenderTargets = 0;
desc.DSVFormat = DXGI_FORMAT_UNKNOWN;
@@ -3765,8 +3757,6 @@ using namespace DX12_Internal;
HRESULT hr = device->CreateGraphicsPipelineState(&desc, IID_PPV_ARGS(&newpso));
assert(SUCCEEDED(hr));
SAFE_DELETE_ARRAY(elements);
pipelines_worker[cmd].push_back(std::make_pair(pipeline_hash, newpso));
pipeline = newpso.Get();
}
WickedEngine/wiRenderer.cpp
+10 -16
View File
@@ -298,11 +298,11 @@ unordered_map<const CameraComponent*, FrameCulling> frameCullings;
vector<uint32_t> pendingMaterialUpdates;
GFX_STRUCT Instance
struct Instance
{
XMFLOAT4A mat0;
XMFLOAT4A mat1;
XMFLOAT4A mat2;
XMFLOAT4 mat0;
XMFLOAT4 mat1;
XMFLOAT4 mat2;
XMUINT4 userdata;
inline void Create(const XMFLOAT4X4& matIn, const XMFLOAT4& colorIn = XMFLOAT4(1, 1, 1, 1), float dither = 0, uint32_t subInstance = 0) volatile
@@ -330,14 +330,12 @@ GFX_STRUCT Instance
userdata.z = 0;
userdata.w = 0;
}
ALIGN_16
};
GFX_STRUCT InstancePrev
struct InstancePrev
{
XMFLOAT4A mat0;
XMFLOAT4A mat1;
XMFLOAT4A mat2;
XMFLOAT4 mat0;
XMFLOAT4 mat1;
XMFLOAT4 mat2;
inline void Create(const XMFLOAT4X4& matIn) volatile
{
@@ -356,12 +354,10 @@ GFX_STRUCT InstancePrev
mat2.z = matIn._33;
mat2.w = matIn._43;
}
ALIGN_16
};
GFX_STRUCT InstanceAtlas
struct InstanceAtlas
{
XMFLOAT4A atlasMulAdd;
XMFLOAT4 atlasMulAdd;
InstanceAtlas(){}
InstanceAtlas(const XMFLOAT4& atlasRemap)
@@ -375,8 +371,6 @@ GFX_STRUCT InstanceAtlas
atlasMulAdd.z = atlasRemap.z;
atlasMulAdd.w = atlasRemap.w;
}
ALIGN_16
};
WickedEngine/wiResourceManager.cpp
+2 -2
View File
@@ -17,10 +17,10 @@ wiResource::~wiResource()
switch (type)
{
case wiResource::IMAGE:
SAFE_DELETE(texture);
delete texture;
break;
case wiResource::SOUND:
SAFE_DELETE(sound);
delete sound;
break;
};
}
WickedEngine/wiScene.cpp
+1 -1
View File
@@ -325,7 +325,7 @@ namespace wiScene
bd.ByteWidth = (uint32_t)(stride * indices.size());
device->CreateBuffer(&bd, &InitData, &indexBuffer);
SAFE_DELETE_ARRAY(gpuIndexData);
delete[] gpuIndexData;
}
WickedEngine/wiScene.h
+7 -9
View File
@@ -614,19 +614,19 @@ namespace wiScene
// Non-serialized attributes:
GFX_STRUCT ShaderBoneType
struct ShaderBoneType
{
XMFLOAT4A pose0;
XMFLOAT4A pose1;
XMFLOAT4A pose2;
XMFLOAT4 pose0;
XMFLOAT4 pose1;
XMFLOAT4 pose2;
inline void Store(const XMMATRIX& M)
{
XMFLOAT4X4 mat;
XMStoreFloat4x4(&mat, M);
pose0 = XMFLOAT4A(mat._11, mat._21, mat._31, mat._41);
pose1 = XMFLOAT4A(mat._12, mat._22, mat._32, mat._42);
pose2 = XMFLOAT4A(mat._13, mat._23, mat._33, mat._43);
pose0 = XMFLOAT4(mat._11, mat._21, mat._31, mat._41);
pose1 = XMFLOAT4(mat._12, mat._22, mat._32, mat._42);
pose2 = XMFLOAT4(mat._13, mat._23, mat._33, mat._43);
}
inline XMMATRIX Load() const
{
@@ -637,8 +637,6 @@ namespace wiScene
pose0.w, pose1.w, pose2.w, 1
);
}
ALIGN_16
};
std::vector<ShaderBoneType> boneData;
wiGraphics::GPUBuffer boneBuffer;
WickedEngine/wiVersion.cpp
+1 -1
View File
@@ -9,7 +9,7 @@ namespace wiVersion
// minor features, major updates
const int minor = 38;
// minor bug fixes, alterations, refactors, updates
const int revision = 3;
const int revision = 4;
long GetVersion()
WickedEngine/wiWidget.cpp
+2 -2
View File
@@ -654,7 +654,7 @@ wiSlider::wiSlider(float start, float end, float defaultValue, float step, const
}
wiSlider::~wiSlider()
{
SAFE_DELETE(valueInputField);
delete valueInputField;
}
void wiSlider::SetValue(float value)
{
@@ -1473,7 +1473,7 @@ void wiWindow::RemoveWidgets(bool alsoDelete)
gui->RemoveWidget(x);
if (alsoDelete)
{
SAFE_DELETE(x);
delete x;
}
}
WickedEngine/wiWidget.h
+1 -1
View File
@@ -182,7 +182,7 @@ protected:
// width of the head of the slider that can be grabbed:
float headWidth = 16;
wiTextInputField* valueInputField;
wiTextInputField* valueInputField = nullptr;
public:
// start : slider minimum value
// end : slider maximum value