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

added feature: multiple uv sets; gltf updates; editor updates;

Browse Source
This commit is contained in:
turanszkij
2019-03-16 18:19:49 +00:00
parent 4163f09a76
commit 45e344cbfa
58 changed files with 5670 additions and 4203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WickedEngine/wiGPUBVH.cpp
+11 -2
View File
@@ -152,7 +152,15 @@ void wiGPUBVH::UpdateGlobalMaterialResources(const Scene& scene, GRAPHICSTHREAD
global_material.normalMapStrength = material.normalMapStrength;
global_material.normalMapFlip = (material._flags & MaterialComponent::FLIP_NORMALMAP ? -1.0f : 1.0f);
global_material.parallaxOcclusionMapping = material.parallaxOcclusionMapping;
global_material.g_xMat_useVertexColors = material.IsUsingVertexColors() ? 1 : 0;
global_material.displacementMapping = material.displacementMapping;
global_material.useVertexColors = material.IsUsingVertexColors() ? 1 : 0;
global_material.uvset_baseColorMap = material.uvset_baseColorMap;
global_material.uvset_surfaceMap = material.uvset_surfaceMap;
global_material.uvset_normalMap = material.uvset_normalMap;
global_material.uvset_displacementMap = material.uvset_displacementMap;
global_material.uvset_emissiveMap = material.uvset_emissiveMap;
global_material.uvset_occlusionMap = material.uvset_occlusionMap;
global_material.specularGlossinessWorkflow = material.IsUsingSpecularGlossinessWorkflow() ? 1 : 0;
// Add extended properties:
const TextureDesc& desc = globalMaterialAtlas.GetDesc();
@@ -477,7 +485,8 @@ void wiGPUBVH::Build(const Scene& scene, GRAPHICSTHREAD threadID)
&globalMaterialBuffer,
mesh.indexBuffer.get(),
mesh.vertexBuffer_POS.get(),
mesh.vertexBuffer_TEX.get(),
mesh.vertexBuffer_UV0.get(),
mesh.vertexBuffer_UV1.get(),
mesh.vertexBuffer_COL.get(),
};
device->BindResources(CS, res, TEXSLOT_ONDEMAND0, ARRAYSIZE(res), threadID);