X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-scene3d%2Fpublic-api%2Floader%2Fshader-definition-factory.cpp;h=a341d208039698b1b30a5c968ebdf5c0bad83941;hp=ec41ef429434a4b16cc619649c7280c6e876f108;hb=b3d23c288c1957114e5eb85bbd3ada6584036eaa;hpb=d5540a3ae34396882044417e296ddce650a1c6f5 diff --git a/dali-scene3d/public-api/loader/shader-definition-factory.cpp b/dali-scene3d/public-api/loader/shader-definition-factory.cpp index ec41ef4..a341d20 100644 --- a/dali-scene3d/public-api/loader/shader-definition-factory.cpp +++ b/dali-scene3d/public-api/loader/shader-definition-factory.cpp @@ -93,6 +93,16 @@ uint64_t HashNode(const MaterialDefinition& materialDef, const MeshDefinition& m hash.Add("SSS"); } + if(MaskMatch(materialDef.mFlags, MaterialDefinition::SPECULAR)) + { + hash.Add("SPECTEX"); + } + + if(MaskMatch(materialDef.mFlags, MaterialDefinition::SPECULAR_COLOR)) + { + hash.Add("SPECCOLTEX"); + } + if(MaskMatch(materialDef.mFlags, MaterialDefinition::OCCLUSION)) { hash.Add("OCCL" /*USION*/); @@ -246,6 +256,16 @@ Index ShaderDefinitionFactory::ProduceShader(NodeDefinition::Renderable& rendera shaderDef.mDefines.push_back("SSS"); } + if(MaskMatch(materialDef.mFlags, MaterialDefinition::SPECULAR)) + { + shaderDef.mDefines.push_back("MATERIAL_SPECULAR_TEXTURE"); + } + + if(MaskMatch(materialDef.mFlags, MaterialDefinition::SPECULAR_COLOR)) + { + shaderDef.mDefines.push_back("MATERIAL_SPECULAR_COLOR_TEXTURE"); + } + if(MaskMatch(materialDef.mFlags, MaterialDefinition::OCCLUSION)) { shaderDef.mDefines.push_back("OCCLUSION");