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

material emissive color separated from base color; voxel gi fix; gamma fixes; slightly reordered gbuffer;

Browse Source
This commit is contained in:
turanszkij
2019-03-02 16:23:54 +00:00
parent aa8fa272d1
commit 30a4f4910b
37 changed files with 218 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/ModelImporter_OBJ.cpp
+4 -1
View File
@@ -47,7 +47,10 @@ void ImportModel_OBJ(const std::string& fileName)
material.baseColor = XMFLOAT4(obj_material.diffuse[0], obj_material.diffuse[1], obj_material.diffuse[2], 1);
material.baseColorMapName = obj_material.diffuse_texname;
material.displacementMapName = obj_material.displacement_texname;
material.emissive = max(obj_material.emission[0], max(obj_material.emission[1], obj_material.emission[2]));
material.emissiveColor.x = obj_material.emission[0];
material.emissiveColor.y = obj_material.emission[1];
material.emissiveColor.z = obj_material.emission[2];
material.emissiveColor.w = max(obj_material.emission[0], max(obj_material.emission[1], obj_material.emission[2]));
material.refractionIndex = obj_material.ior;
material.metalness = obj_material.metallic;
material.normalMapName = obj_material.normal_texname;