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

first implementation

Browse Source
This commit is contained in:
turanszkij
2017-05-12 11:43:37 +02:00
parent a7d7b215ff
commit 304aa74eb7
8 changed files with 263 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WickedEngine/ConstantBufferMapping.h
+14 -14
View File
@@ -9,27 +9,27 @@
#define CBSLOT_RENDERER_WORLD 0
#define CBSLOT_RENDERER_FRAME 1
#define CBSLOT_RENDERER_CAMERA 2
#define CBSLOT_RENDERER_MATERIAL 3
#define CBSLOT_RENDERER_MISC 4
#define CBSLOT_RENDERER_MISC 3
#define CBSLOT_IMAGE_IMAGE 5
#define CBSLOT_IMAGE_POSTPROCESS 6
#define CBSLOT_IMAGE_IMAGE 4
#define CBSLOT_IMAGE_POSTPROCESS 5
#define CBSLOT_API 8
#define CBSLOT_API 6
// On demand buffers:
// These are bound on demand and alive until another is bound at the same slot
#define CBSLOT_RENDERER_CUBEMAPRENDER 10
#define CBSLOT_RENDERER_VOLUMELIGHT 10
#define CBSLOT_RENDERER_DECAL 10
#define CBSLOT_RENDERER_TESSELLATION 10
#define CBSLOT_RENDERER_DISPATCHPARAMS 10
#define CBSLOT_RENDERER_VOXELIZER 10
#define CBSLOT_RENDERER_MATERIAL 7
#define CBSLOT_RENDERER_CUBEMAPRENDER 8
#define CBSLOT_RENDERER_VOLUMELIGHT 8
#define CBSLOT_RENDERER_DECAL 8
#define CBSLOT_RENDERER_TESSELLATION 8
#define CBSLOT_RENDERER_DISPATCHPARAMS 8
#define CBSLOT_RENDERER_VOXELIZER 8
#define CBSLOT_OTHER_EMITTEDPARTICLE 10
#define CBSLOT_OTHER_HAIRPARTICLE 10
#define CBSLOT_OTHER_LENSFLARE 10
#define CBSLOT_OTHER_EMITTEDPARTICLE 8
#define CBSLOT_OTHER_HAIRPARTICLE 8
#define CBSLOT_OTHER_LENSFLARE 8
WickedEngine/globals.hlsli
-13
View File
@@ -99,19 +99,6 @@ CBUFFER(Camera_CommonCB, CBSLOT_RENDERER_CAMERA)
float4x4 g_xCamera_View;
float4x4 g_xCamera_Proj;
float3 g_xCamera_CamPos; float xPadding0_Camera_CommonCB;
}
CBUFFER(MaterialCB, CBSLOT_RENDERER_MATERIAL)
{
float4 g_xMat_baseColor;
float4 g_xMat_texMulAdd;
float g_xMat_roughness;
float g_xMat_reflectance;
float g_xMat_metalness;
float g_xMat_emissive;
float g_xMat_refractionIndex;
float g_xMat_subsurfaceScattering;
float g_xMat_normalMapStrength;
float g_xMat_parallaxOcclusionMapping;
};
CBUFFER(MiscCB, CBSLOT_RENDERER_MISC)
{
WickedEngine/objectHF.hlsli
+17
View File
@@ -12,6 +12,23 @@
#include "packHF.hlsli"
#include "lightingHF.hlsli"
// UNIFORMS
//////////////////
CBUFFER(MaterialCB, CBSLOT_RENDERER_MATERIAL)
{
float4 g_xMat_baseColor;
float4 g_xMat_texMulAdd;
float g_xMat_roughness;
float g_xMat_reflectance;
float g_xMat_metalness;
float g_xMat_emissive;
float g_xMat_refractionIndex;
float g_xMat_subsurfaceScattering;
float g_xMat_normalMapStrength;
float g_xMat_parallaxOcclusionMapping;
};
// DEFINITIONS
//////////////////
WickedEngine/wiEnums.h
-1
View File
@@ -66,7 +66,6 @@ enum CBTYPES
CBTYPE_WORLD,
CBTYPE_FRAME,
CBTYPE_CAMERA,
CBTYPE_MATERIAL,
CBTYPE_MISC,
CBTYPE_VOLUMELIGHT,
CBTYPE_DECAL,
WickedEngine/wiLoader.cpp
+72
View File
@@ -1354,6 +1354,64 @@ Material::~Material() {
displacementMap = nullptr;
specularMap = nullptr;
}
void Material::init()
{
diffuseColor = XMFLOAT3(1, 1, 1);
refMapName = "";
refMap = nullptr;
textureName = "";
texture = nullptr;
premultipliedTexture = false;
blendFlag = BLENDMODE::BLENDMODE_ALPHA;
normalMapName = "";
normalMap = nullptr;
displacementMapName = "";
displacementMap = nullptr;
specularMapName = "";
specularMap = nullptr;
toonshading = water = false;
enviroReflection = 0.0f;
specular = XMFLOAT4(0, 0, 0, 0);
specular_power = 50;
movingTex = XMFLOAT3(0, 0, 0);
framesToWaitForTexCoordOffset = 0;
texMulAdd = XMFLOAT4(1, 1, 0, 0);
isSky = water = shadeless = false;
cast_shadow = true;
// PBR props
baseColor = XMFLOAT3(1, 1, 1);
alpha = 1.0f;
roughness = 0.0f;
reflectance = 0.0f;
metalness = 0.0f;
refractionIndex = 0.0f;
subsurfaceScattering = 0.0f;
emissive = 0.0f;
normalMapStrength = 1.0f;
parallaxOcclusionMapping = 0.0f;
planar_reflections = false;
alphaRef = 1.0f; // no alpha test by default
// constant buffer creation
GPUBufferDesc bd;
ZeroMemory(&bd, sizeof(bd));
bd.BindFlags = BIND_CONSTANT_BUFFER;
bd.Usage = USAGE_DYNAMIC;
bd.CPUAccessFlags = CPU_ACCESS_WRITE;
bd.ByteWidth = sizeof(MaterialCB);
wiRenderer::GetDevice()->CreateBuffer(&bd, nullptr, &constantBuffer);
}
void Material::ConvertToPhysicallyBasedMaterial()
{
baseColor = diffuseColor;
@@ -1509,6 +1567,20 @@ void Material::Serialize(wiArchive& archive)
}
}
}
void Material::MaterialCB::Create(const Material& mat)
{
baseColor = XMFLOAT4(mat.baseColor.x, mat.baseColor.y, mat.baseColor.z, mat.alpha);
texMulAdd = mat.texMulAdd;
roughness = mat.roughness;
reflectance = mat.reflectance;
metalness = mat.metalness;
emissive = mat.emissive;
refractionIndex = mat.refractionIndex;
subsurfaceScattering = mat.subsurfaceScattering;
normalMapStrength = (mat.normalMap == nullptr ? 0 : mat.normalMapStrength);
parallaxOcclusionMapping = mat.parallaxOcclusionMapping;
}
#pragma endregion
#pragma region MESHSUBSET
WickedEngine/wiLoader.h
+26 -48
View File
@@ -8,6 +8,7 @@
#include "wiFrustum.h"
#include "wiTransform.h"
#include "wiIntersectables.h"
#include "ConstantBufferMapping.h"
#include <vector>
#include <map>
@@ -163,6 +164,30 @@ struct Material
std::string specularMapName;
wiGraphicsTypes::Texture2D* specularMap;
GFX_STRUCT MaterialCB
{
XMFLOAT4 baseColor; // + alpha (.w)
XMFLOAT4 texMulAdd;
float roughness;
float reflectance;
float metalness;
float emissive;
float refractionIndex;
float subsurfaceScattering;
float normalMapStrength;
float parallaxOcclusionMapping;
CB_SETBINDSLOT(CBSLOT_RENDERER_MATERIAL)
MaterialCB() {};
MaterialCB(const Material& mat) { Create(mat); };
void Create(const Material& mat);
ALIGN_16
};
MaterialCB gpuData;
wiGraphicsTypes::GPUBuffer constantBuffer;
bool toonshading;
bool water,shadeless;
float enviroReflection;
@@ -202,54 +227,7 @@ struct Material
init();
}
~Material();
void init()
{
diffuseColor = XMFLOAT3(1, 1, 1);
refMapName = "";
refMap = nullptr;
textureName = "";
texture = nullptr;
premultipliedTexture = false;
blendFlag = BLENDMODE::BLENDMODE_ALPHA;
normalMapName = "";
normalMap = nullptr;
displacementMapName = "";
displacementMap = nullptr;
specularMapName = "";
specularMap = nullptr;
toonshading = water = false;
enviroReflection = 0.0f;
specular = XMFLOAT4(0, 0, 0, 0);
specular_power = 50;
movingTex = XMFLOAT3(0, 0, 0);
framesToWaitForTexCoordOffset = 0;
texMulAdd = XMFLOAT4(1, 1, 0, 0);
isSky = water = shadeless = false;
cast_shadow = true;
// PBR props
baseColor = XMFLOAT3(1, 1, 1);
alpha = 1.0f;
roughness = 0.0f;
reflectance = 0.0f;
metalness = 0.0f;
refractionIndex = 0.0f;
subsurfaceScattering = 0.0f;
emissive = 0.0f;
normalMapStrength = 1.0f;
parallaxOcclusionMapping = 0.0f;
planar_reflections = false;
alphaRef = 1.0f; // no alpha test by default
}
void init();
bool IsTransparent() const { return alpha < 1.0f; }
bool IsWater() const { return water; }
WickedEngine/wiRenderer.cpp
+134 -150
View File
@@ -571,9 +571,6 @@ void wiRenderer::LoadBuffers()
bd.ByteWidth = sizeof(CameraCB);
GetDevice()->CreateBuffer(&bd, nullptr, constantBuffers[CBTYPE_CAMERA]);
bd.ByteWidth = sizeof(MaterialCB);
GetDevice()->CreateBuffer(&bd, nullptr, constantBuffers[CBTYPE_MATERIAL]);
bd.ByteWidth = sizeof(MiscCB);
GetDevice()->CreateBuffer(&bd, nullptr, constantBuffers[CBTYPE_MISC]);
@@ -1365,8 +1362,6 @@ void wiRenderer::BindPersistentState(GRAPHICSTHREAD threadID)
GetDevice()->BindConstantBufferDS(constantBuffers[CBTYPE_CAMERA], CB_GETBINDSLOT(CameraCB), threadID);
GetDevice()->BindConstantBufferCS(constantBuffers[CBTYPE_CAMERA], CB_GETBINDSLOT(CameraCB), threadID);
GetDevice()->BindConstantBufferPS(constantBuffers[CBTYPE_MATERIAL], CB_GETBINDSLOT(MaterialCB), threadID);
GetDevice()->BindConstantBufferVS(constantBuffers[CBTYPE_MISC], CB_GETBINDSLOT(MiscCB), threadID);
GetDevice()->BindConstantBufferPS(constantBuffers[CBTYPE_MISC], CB_GETBINDSLOT(MiscCB), threadID);
GetDevice()->BindConstantBufferGS(constantBuffers[CBTYPE_MISC], CB_GETBINDSLOT(MiscCB), threadID);
@@ -1791,15 +1786,28 @@ void wiRenderer::UpdateRenderData(GRAPHICSTHREAD threadID)
UpdateWorldCB(threadID); // only commits when parameters are changed
UpdateFrameCB(threadID);
// Skinning:
wiProfiler::GetInstance().BeginRange("Skinning", wiProfiler::DOMAIN_GPU, threadID);
GetDevice()->EventBegin("Skinning", threadID);
{
bool streamOutSetUp = false;
for (Model* model : GetScene().models)
{
// Update material constant buffers:
Material::MaterialCB materialGPUData;
for (auto& it : model->materials)
{
Material* material = it.second;
materialGPUData.Create(*material);
// These will probably not change every time so only issue an update if it is necessary:
if (memcmp(&material->gpuData, &materialGPUData, sizeof(Material::MaterialCB) != 0))
{
material->gpuData = materialGPUData;
GetDevice()->UpdateBuffer(&material->constantBuffer, &materialGPUData, threadID);
}
}
// Skinning:
for (MeshCollection::iterator iter = model->meshes.begin(); iter != model->meshes.end(); ++iter)
{
Mesh* mesh = iter->second;
@@ -1898,7 +1906,6 @@ void wiRenderer::UpdateRenderData(GRAPHICSTHREAD threadID)
}
#endif
}
GetDevice()->EventEnd(threadID);
wiProfiler::GetInstance().EndRange(threadID); // skinning
@@ -3693,132 +3700,132 @@ void wiRenderer::RenderMeshes(const XMFLOAT3& eye, const CulledCollection& culle
targetStencilRef = mesh->stencilRef;
if (mesh->hasImpostor() && shaderType != SHADERTYPE_VOXELIZE)
{
int k = 0;
for (const Object* instance : visibleInstances)
{
if (instance->emitterType != Object::EmitterType::EMITTER_INVISIBLE)
{
const float impostorThreshold = instance->bounds.getRadius();
float dist = wiMath::Distance(eye, instance->bounds.getCenter());
float dither = instance->transparency;
dither = wiMath::SmoothStep(1.0f, dither, wiMath::Clamp((dist - impostorDistance) / impostorThreshold, 0, 1));
if (dither > 1.0f - FLT_EPSILON)
continue;
//if (mesh->hasImpostor() && shaderType != SHADERTYPE_VOXELIZE)
//{
// int k = 0;
// for (const Object* instance : visibleInstances)
// {
// if (instance->emitterType != Object::EmitterType::EMITTER_INVISIBLE)
// {
// const float impostorThreshold = instance->bounds.getRadius();
// float dist = wiMath::Distance(eye, instance->bounds.getCenter());
// float dither = instance->transparency;
// dither = wiMath::SmoothStep(1.0f, dither, wiMath::Clamp((dist - impostorDistance) / impostorThreshold, 0, 1));
// if (dither > 1.0f - FLT_EPSILON)
// continue;
if (!occlusionCulling || !instance->IsOccluded())
{
XMStoreFloat4x4(&tempMat, mesh->aabb.getAsBoxMatrix()*XMLoadFloat4x4(&instance->world));
mesh->AddRenderableInstance(Instance(tempMat, dither, instance->color), k, threadID);
++k;
}
}
}
if (k > 0)
{
mesh->UpdateRenderableInstances(k, threadID);
// if (!occlusionCulling || !instance->IsOccluded())
// {
// XMStoreFloat4x4(&tempMat, mesh->aabb.getAsBoxMatrix()*XMLoadFloat4x4(&instance->world));
// mesh->AddRenderableInstance(Instance(tempMat, dither, instance->color), k, threadID);
// ++k;
// }
// }
// }
// if (k > 0)
// {
// mesh->UpdateRenderableInstances(k, threadID);
MaterialCB mcb;
ZeroMemory(&mcb, sizeof(mcb));
mcb.baseColor = XMFLOAT4(1, 1, 1, 1);
mcb.texMulAdd = XMFLOAT4(1, 1, 0, 0);
mcb.normalMapStrength = 1.0f;
mcb.roughness = 1.0f;
mcb.reflectance = 1.0f;
mcb.metalness = 1.0f;
UpdateMaterialCB(mcb, threadID);
// MaterialCB mcb;
// ZeroMemory(&mcb, sizeof(mcb));
// mcb.baseColor = XMFLOAT4(1, 1, 1, 1);
// mcb.texMulAdd = XMFLOAT4(1, 1, 0, 0);
// mcb.normalMapStrength = 1.0f;
// mcb.roughness = 1.0f;
// mcb.reflectance = 1.0f;
// mcb.metalness = 1.0f;
// UpdateMaterialCB(mcb, threadID);
if (shaderType == SHADERTYPE_SHADOW || shaderType == SHADERTYPE_SHADOWCUBE)
{
GetDevice()->BindRasterizerState(rasterizers[RSTYPE_SHADOW], threadID);
}
else
{
GetDevice()->BindRasterizerState(wireRender ? rasterizers[RSTYPE_WIRE] : rasterizers[RSTYPE_FRONT], threadID);
}
// if (shaderType == SHADERTYPE_SHADOW || shaderType == SHADERTYPE_SHADOWCUBE)
// {
// GetDevice()->BindRasterizerState(rasterizers[RSTYPE_SHADOW], threadID);
// }
// else
// {
// GetDevice()->BindRasterizerState(wireRender ? rasterizers[RSTYPE_WIRE] : rasterizers[RSTYPE_FRONT], threadID);
// }
GetDevice()->BindDepthStencilState(depthStencils[targetDepthStencilState], targetStencilRef, threadID);
// GetDevice()->BindDepthStencilState(depthStencils[targetDepthStencilState], targetStencilRef, threadID);
GetDevice()->BindIndexBuffer(nullptr, threadID);
// GetDevice()->BindIndexBuffer(nullptr, threadID);
if (shaderType == SHADERTYPE_ALPHATESTONLY || shaderType == SHADERTYPE_TEXTURE || shaderType == SHADERTYPE_SHADOW || shaderType == SHADERTYPE_SHADOWCUBE)
{
GPUBuffer* vbs[] = {
&Mesh::impostorVBs[VPROP_POS],
&Mesh::impostorVBs[VPROP_TEX],
&mesh->instanceBuffer
};
UINT strides[] = {
sizeof(XMFLOAT4),
sizeof(XMFLOAT4),
sizeof(Instance)
};
GetDevice()->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, threadID);
}
else
{
GPUBuffer* vbs[] = {
&Mesh::impostorVBs[VPROP_POS],
&Mesh::impostorVBs[VPROP_NOR],
&Mesh::impostorVBs[VPROP_TEX],
&Mesh::impostorVBs[VPROP_POS],
&mesh->instanceBuffer
};
UINT strides[] = {
sizeof(XMFLOAT4),
sizeof(XMFLOAT4),
sizeof(XMFLOAT4),
sizeof(XMFLOAT4),
sizeof(Instance)
};
GetDevice()->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, threadID);
}
// if (shaderType == SHADERTYPE_ALPHATESTONLY || shaderType == SHADERTYPE_TEXTURE || shaderType == SHADERTYPE_SHADOW || shaderType == SHADERTYPE_SHADOWCUBE)
// {
// GPUBuffer* vbs[] = {
// &Mesh::impostorVBs[VPROP_POS],
// &Mesh::impostorVBs[VPROP_TEX],
// &mesh->instanceBuffer
// };
// UINT strides[] = {
// sizeof(XMFLOAT4),
// sizeof(XMFLOAT4),
// sizeof(Instance)
// };
// GetDevice()->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, threadID);
// }
// else
// {
// GPUBuffer* vbs[] = {
// &Mesh::impostorVBs[VPROP_POS],
// &Mesh::impostorVBs[VPROP_NOR],
// &Mesh::impostorVBs[VPROP_TEX],
// &Mesh::impostorVBs[VPROP_POS],
// &mesh->instanceBuffer
// };
// UINT strides[] = {
// sizeof(XMFLOAT4),
// sizeof(XMFLOAT4),
// sizeof(XMFLOAT4),
// sizeof(XMFLOAT4),
// sizeof(Instance)
// };
// GetDevice()->BindVertexBuffers(vbs, 0, ARRAYSIZE(vbs), strides, threadID);
// }
GetDevice()->BindResourcePS(mesh->impostorTarget.GetTexture(0), TEXSLOT_ONDEMAND0, threadID);
if (!easyTextureBind)
{
GetDevice()->BindResourcePS(mesh->impostorTarget.GetTexture(1), TEXSLOT_ONDEMAND1, threadID);
GetDevice()->BindResourcePS(mesh->impostorTarget.GetTexture(2), TEXSLOT_ONDEMAND2, threadID);
GetDevice()->BindResourcePS(mesh->impostorTarget.GetTexture(3), TEXSLOT_ONDEMAND3, threadID);
GetDevice()->BindResourcePS(mesh->impostorTarget.GetTexture(4), TEXSLOT_ONDEMAND4, threadID);
}
// GetDevice()->BindResourcePS(mesh->impostorTarget.GetTexture(0), TEXSLOT_ONDEMAND0, threadID);
// if (!easyTextureBind)
// {
// GetDevice()->BindResourcePS(mesh->impostorTarget.GetTexture(1), TEXSLOT_ONDEMAND1, threadID);
// GetDevice()->BindResourcePS(mesh->impostorTarget.GetTexture(2), TEXSLOT_ONDEMAND2, threadID);
// GetDevice()->BindResourcePS(mesh->impostorTarget.GetTexture(3), TEXSLOT_ONDEMAND3, threadID);
// GetDevice()->BindResourcePS(mesh->impostorTarget.GetTexture(4), TEXSLOT_ONDEMAND4, threadID);
// }
if (wireRender)
{
GetDevice()->BindPS(pixelShaders[PSTYPE_OBJECT_SIMPLEST], threadID);
}
else
{
switch (shaderType)
{
case SHADERTYPE_DEFERRED:
GetDevice()->BindPS(pixelShaders[PSTYPE_OBJECT_DEFERRED_NORMALMAP], threadID);
break;
case SHADERTYPE_FORWARD:
GetDevice()->BindPS(pixelShaders[PSTYPE_OBJECT_FORWARD_DIRLIGHT_NORMALMAP], threadID);
break;
case SHADERTYPE_TILEDFORWARD:
GetDevice()->BindPS(pixelShaders[PSTYPE_OBJECT_TILEDFORWARD], threadID);
break;
case SHADERTYPE_SHADOW:
GetDevice()->BindPS(pixelShaders[PSTYPE_SHADOW], threadID);
break;
case SHADERTYPE_SHADOWCUBE:
GetDevice()->BindPS(pixelShaders[PSTYPE_SHADOWCUBEMAPRENDER], threadID);
break;
case SHADERTYPE_ALPHATESTONLY:
GetDevice()->BindPS(pixelShaders[PSTYPE_OBJECT_ALPHATESTONLY], threadID);
break;
default:
GetDevice()->BindPS(pixelShaders[PSTYPE_OBJECT_TEXTUREONLY], threadID);
break;
}
}
GetDevice()->DrawInstanced(6 * 6, k, threadID); // 6 * 6: see Mesh::CreateImpostorVB function
}
}
// if (wireRender)
// {
// GetDevice()->BindPS(pixelShaders[PSTYPE_OBJECT_SIMPLEST], threadID);
// }
// else
// {
// switch (shaderType)
// {
// case SHADERTYPE_DEFERRED:
// GetDevice()->BindPS(pixelShaders[PSTYPE_OBJECT_DEFERRED_NORMALMAP], threadID);
// break;
// case SHADERTYPE_FORWARD:
// GetDevice()->BindPS(pixelShaders[PSTYPE_OBJECT_FORWARD_DIRLIGHT_NORMALMAP], threadID);
// break;
// case SHADERTYPE_TILEDFORWARD:
// GetDevice()->BindPS(pixelShaders[PSTYPE_OBJECT_TILEDFORWARD], threadID);
// break;
// case SHADERTYPE_SHADOW:
// GetDevice()->BindPS(pixelShaders[PSTYPE_SHADOW], threadID);
// break;
// case SHADERTYPE_SHADOWCUBE:
// GetDevice()->BindPS(pixelShaders[PSTYPE_SHADOWCUBEMAPRENDER], threadID);
// break;
// case SHADERTYPE_ALPHATESTONLY:
// GetDevice()->BindPS(pixelShaders[PSTYPE_OBJECT_ALPHATESTONLY], threadID);
// break;
// default:
// GetDevice()->BindPS(pixelShaders[PSTYPE_OBJECT_TEXTUREONLY], threadID);
// break;
// }
// }
// GetDevice()->DrawInstanced(6 * 6, k, threadID); // 6 * 6: see Mesh::CreateImpostorVB function
// }
//}
if (shaderType == SHADERTYPE_VOXELIZE)
{
@@ -3978,7 +3985,7 @@ void wiRenderer::RenderMeshes(const XMFLOAT3& eye, const CulledCollection& culle
}
GetDevice()->BindDepthStencilState(depthStencils[targetDepthStencilState], targetStencilRef, threadID);
UpdateMaterialCB(MaterialCB(*material), threadID);
GetDevice()->BindConstantBufferPS(&material->constantBuffer, CB_GETBINDSLOT(Material::MaterialCB), threadID);
if (!wireRender)
{
@@ -4978,15 +4985,6 @@ void wiRenderer::UpdateCameraCB(Camera* camera, GRAPHICSTHREAD threadID)
GetDevice()->UpdateBuffer(constantBuffers[CBTYPE_CAMERA], &cb, threadID);
}
void wiRenderer::UpdateMaterialCB(const MaterialCB& value, GRAPHICSTHREAD threadID)
{
static MaterialCB prevcb[GRAPHICSTHREAD_COUNT];
if (memcmp(&prevcb[threadID],&value,sizeof(MaterialCB)) != 0)
{
prevcb[threadID] = value;
GetDevice()->UpdateBuffer(constantBuffers[CBTYPE_MATERIAL], &value, threadID);
}
}
wiRenderer::APICB apiCB[GRAPHICSTHREAD_COUNT];
void wiRenderer::SetClipPlane(const XMFLOAT4& clipPlane, GRAPHICSTHREAD threadID)
{
@@ -5696,7 +5694,7 @@ void wiRenderer::CreateImpostor(Mesh* mesh)
{
GetDevice()->BindIndexBuffer(&subset.indexBuffer, threadID);
UpdateMaterialCB(MaterialCB(*subset.material), threadID);
GetDevice()->BindConstantBufferPS(&subset.material->constantBuffer, CB_GETBINDSLOT(Material::MaterialCB), threadID);
GetDevice()->BindResourcePS(subset.material->GetBaseColorMap(), TEXSLOT_ONDEMAND0, threadID);
GetDevice()->BindResourcePS(subset.material->GetNormalMap(), TEXSLOT_ONDEMAND1, threadID);
@@ -5725,20 +5723,6 @@ void wiRenderer::CreateImpostor(Mesh* mesh)
GetDevice()->UNLOCK();
}
void wiRenderer::MaterialCB::Create(const Material& mat)
{
baseColor = XMFLOAT4(mat.baseColor.x, mat.baseColor.y, mat.baseColor.z, mat.alpha);
texMulAdd = mat.texMulAdd;
roughness = mat.roughness;
reflectance = mat.reflectance;
metalness = mat.metalness;
emissive = mat.emissive;
refractionIndex = mat.refractionIndex;
subsurfaceScattering = mat.subsurfaceScattering;
normalMapStrength = (mat.normalMap == nullptr? 0 : mat.normalMapStrength);
parallaxOcclusionMapping = mat.parallaxOcclusionMapping;
}
void wiRenderer::AddRenderableTranslator(wiTranslator* translator)
{
renderableTranslators.push_back(translator);
WickedEngine/wiRenderer.h
-22
View File
@@ -157,27 +157,6 @@ public:
ALIGN_16
};
GFX_STRUCT MaterialCB
{
XMFLOAT4 baseColor; // + alpha (.w)
XMFLOAT4 texMulAdd;
float roughness;
float reflectance;
float metalness;
float emissive;
float refractionIndex;
float subsurfaceScattering;
float normalMapStrength;
float parallaxOcclusionMapping;
CB_SETBINDSLOT(CBSLOT_RENDERER_MATERIAL)
MaterialCB() {};
MaterialCB(const Material& mat) { Create(mat); };
void Create(const Material& mat);
ALIGN_16
};
GFX_STRUCT MiscCB
{
XMMATRIX mTransform;
@@ -461,7 +440,6 @@ public:
static void UpdateWorldCB(GRAPHICSTHREAD threadID);
static void UpdateFrameCB(GRAPHICSTHREAD threadID);
static void UpdateCameraCB(Camera* camera, GRAPHICSTHREAD threadID);
static void UpdateMaterialCB(const MaterialCB& value, GRAPHICSTHREAD threadID);
static void SetClipPlane(const XMFLOAT4& clipPlane, GRAPHICSTHREAD threadID);
static void SetAlphaRef(float alphaRef, GRAPHICSTHREAD threadID);
static void ResetAlphaRef(GRAPHICSTHREAD threadID) { SetAlphaRef(0.75f, threadID); }