[Tizen] Fix Scene3d::Loader bugs

 - Make Renderer translucent when AlphaMode is Blend
 - Use discard for AlphaMode.Mask in shader
 - Fixed ConvertSampler bug.
 - Fixed crash when there isn't "scene" property in glTF
 - Fixed wrong loading of buffer when the bufferView uses stride.
 - Returns MeshDefinition::Blob::GetBufferSize() only mLength
   This is because every use case of this method is to set real buffer size without considering stride.
 - Fix texture order of Specular and Specular color.

Change-Id: Ie05108557ea25faa4865ce0e3903d7018f1db621
Signed-off-by: seungho baek <sbsh.baek@samsung.com>

diff --git a/dali-scene3d/internal/graphics/shaders/default-physically-based-shader.frag b/dali-scene3d/internal/graphics/shaders/default-physically-based-shader.frag
index 8c9e7ea..2dfc47b 100644 (file)
--- a/dali-scene3d/internal/graphics/shaders/default-physically-based-shader.frag
+++ b/dali-scene3d/internal/graphics/shaders/default-physically-based-shader.frag
@@ -55,15 +55,6 @@ uniform sampler2D sAlbedoMetal;
 uniform sampler2D sNormalRoughness;
 #endif
 
-uniform float uSpecularFactor;
-uniform vec3  uSpecularColorFactor;
-#ifdef MATERIAL_SPECULAR_TEXTURE
-uniform sampler2D sSpecular;
-#endif
-#ifdef MATERIAL_SPECULAR_COLOR_TEXTURE
-uniform sampler2D sSpecularColor;
-#endif
-
 #ifdef OCCLUSION
 uniform sampler2D sOcclusion;
 uniform float uOcclusionStrength;
@@ -74,6 +65,15 @@ uniform sampler2D sEmissive;
 uniform vec3 uEmissiveFactor;
 #endif
 
+uniform float uSpecularFactor;
+uniform vec3  uSpecularColorFactor;
+#ifdef MATERIAL_SPECULAR_TEXTURE
+uniform sampler2D sSpecular;
+#endif
+#ifdef MATERIAL_SPECULAR_COLOR_TEXTURE
+uniform sampler2D sSpecularColor;
+#endif
+
 //// For IBL
 uniform sampler2D sbrdfLUT;
 uniform samplerCube sDiffuseEnvSampler;
@@ -146,12 +146,15 @@ void main()
 #endif // THREE_TEX
 
   // The value of uOpaque and uMask can be 0.0 or 1.0.
+  // If uMask is 0.0, a Pixel that has bigger alpha than uAlphaThreashold becomes fully opaque,
+  // in other hand, a pixel that has smaller alpha than uAlphaThreashold becomes fully transparent.
   // If uOpaque is 1.0, alpha value of final color is 1.0;
-  // If uOpaque is 0.0 and uMask is 1.0, alpha value of final color is 0.0 when input alpha is lower than uAlphaThreshold or
-  // 1.0 when input alpha is larger than uAlphaThreshold.
   // https://www.khronos.org/registry/glTF/specs/2.0/glTF-2.0.html#_material_alphamode
+  if(uMask > 0.5 && baseColor.a < uAlphaThreshold)
+  {
+    discard;
+  }
   baseColor.a = mix(baseColor.a, 1.0, uOpaque);
-  baseColor.a = min(mix(baseColor.a, floor(baseColor.a - uAlphaThreshold + 1.0), uMask), 1.0);
 
   metallic = clamp(metallic, 0.0, 1.0);
   // Roughness is authored as perceptual roughness; as is convention,

diff --git a/dali-scene3d/public-api/loader/gltf2-loader.cpp b/dali-scene3d/public-api/loader/gltf2-loader.cpp
index 09ce609..d6944e1 100644 (file)
--- a/dali-scene3d/public-api/loader/gltf2-loader.cpp
+++ b/dali-scene3d/public-api/loader/gltf2-loader.cpp
@@ -423,7 +423,7 @@ SamplerFlags::Type ConvertSampler(const gt::Ref<gt::Sampler>& s)
 {
   if(s)
   {
-    return (s->mMinFilter < gt::Filter::NEAREST_MIPMAP_NEAREST) ? (s->mMinFilter - gt::Filter::NEAREST) : ((s->mMinFilter - gt::Filter::NEAREST_MIPMAP_NEAREST) + 2) | ((s->mMagFilter - gt::Filter::NEAREST) << SamplerFlags::FILTER_MAG_SHIFT) | (ConvertWrapMode(s->mWrapS) << SamplerFlags::WRAP_S_SHIFT) | (ConvertWrapMode(s->mWrapT) << SamplerFlags::WRAP_T_SHIFT);
+    return ((s->mMinFilter < gt::Filter::NEAREST_MIPMAP_NEAREST) ? (s->mMinFilter - gt::Filter::NEAREST) : ((s->mMinFilter - gt::Filter::NEAREST_MIPMAP_NEAREST) + 2)) | ((s->mMagFilter - gt::Filter::NEAREST) << SamplerFlags::FILTER_MAG_SHIFT) | (ConvertWrapMode(s->mWrapS) << SamplerFlags::WRAP_S_SHIFT) | (ConvertWrapMode(s->mWrapT) << SamplerFlags::WRAP_T_SHIFT);
   }
   else
   {
@@ -446,13 +446,15 @@ void ConvertMaterial(const gt::Material& m, decltype(ResourceBundle::mMaterials)
   MaterialDefinition matDef;
 
   auto& pbr = m.mPbrMetallicRoughness;
-  if(pbr.mBaseColorFactor.a < 1.f)
+  if(m.mAlphaMode == gt::AlphaMode::BLEND)
   {
+    matDef.mIsOpaque = false;
     matDef.mFlags |= MaterialDefinition::TRANSPARENCY;
   }
 
   if(m.mAlphaMode == gt::AlphaMode::MASK)
   {
+    matDef.mIsMask = true;
     matDef.SetAlphaCutoff(std::min(1.f, std::max(0.f, m.mAlphaCutoff)));
   }
 
@@ -888,14 +890,19 @@ void ConvertSceneNodes(const gt::Scene& scene, ConversionContext& cctx, bool isM
 
 void ConvertNodes(const gt::Document& doc, ConversionContext& cctx, bool isMRendererModel)
 {
-  ConvertSceneNodes(*doc.mScene, cctx, isMRendererModel);
+  uint32_t rootSceneIndex = 0u;
+  if(doc.mScene)
+  {
+    rootSceneIndex = doc.mScene.GetIndex();
+  }
+  ConvertSceneNodes(doc.mScenes[rootSceneIndex], cctx, isMRendererModel);
 
-  for(uint32_t i = 0, i1 = doc.mScene.GetIndex(); i < i1; ++i)
+  for(uint32_t i = 0, i1 = rootSceneIndex; i < i1; ++i)
   {
     ConvertSceneNodes(doc.mScenes[i], cctx, isMRendererModel);
   }
 
-  for(uint32_t i = doc.mScene.GetIndex() + 1; i < doc.mScenes.size(); ++i)
+  for(uint32_t i = rootSceneIndex + 1; i < doc.mScenes.size(); ++i)
   {
     ConvertSceneNodes(doc.mScenes[i], cctx, isMRendererModel);
   }

diff --git a/dali-scene3d/public-api/loader/material-definition.h b/dali-scene3d/public-api/loader/material-definition.h
index 119f7c4..c3164c6 100644 (file)
--- a/dali-scene3d/public-api/loader/material-definition.h
+++ b/dali-scene3d/public-api/loader/material-definition.h
@@ -174,10 +174,10 @@ struct DALI_SCENE3D_API MaterialDefinition
 
   MaterialDefinition() = default;
 
-  MaterialDefinition(const MaterialDefinition&) = delete;
+  MaterialDefinition(const MaterialDefinition&)            = delete;
   MaterialDefinition& operator=(const MaterialDefinition&) = delete;
 
-  MaterialDefinition(MaterialDefinition&&) = default;
+  MaterialDefinition(MaterialDefinition&&)            = default;
   MaterialDefinition& operator=(MaterialDefinition&&) = default;
 
   /**
@@ -241,6 +241,9 @@ public: // DATA
   bool mNeedNormalTexture            = true;
   bool mDoubleSided                  = false;
 
+  bool mIsOpaque = true;
+  bool mIsMask   = false;
+
   std::vector<TextureStage> mTextureStages;
 };
 
@@ -248,4 +251,4 @@ public: // DATA
 } // namespace Scene3D
 } // namespace Dali
 
-#endif //DALI_SCENE3D_LOADER_MATERIAL_DEFINITION_H
+#endif // DALI_SCENE3D_LOADER_MATERIAL_DEFINITION_H

diff --git a/dali-scene3d/public-api/loader/mesh-definition.cpp b/dali-scene3d/public-api/loader/mesh-definition.cpp
index f147ca7..f0c2fc7 100644 (file)
--- a/dali-scene3d/public-api/loader/mesh-definition.cpp
+++ b/dali-scene3d/public-api/loader/mesh-definition.cpp
@@ -85,14 +85,15 @@ bool ReadBlob(const MeshDefinition::Blob& descriptor, std::istream& source, uint
     DALI_ASSERT_DEBUG(descriptor.mStride > descriptor.mElementSizeHint);
     const uint32_t diff     = descriptor.mStride - descriptor.mElementSizeHint;
     uint32_t       readSize = 0;
-    while(readSize < descriptor.mLength &&
+    uint32_t totalSize = (descriptor.mLength / descriptor.mElementSizeHint) * descriptor.mStride;
+    while(readSize < totalSize &&
           source.read(reinterpret_cast<char*>(target), descriptor.mElementSizeHint) &&
           source.seekg(diff, std::istream::cur))
     {
       readSize += descriptor.mStride;
       target += descriptor.mElementSizeHint;
     }
-    return readSize == descriptor.mLength;
+    return readSize == totalSize;
   }
 }
 
@@ -518,7 +519,7 @@ MeshDefinition::Blob::Blob(uint32_t offset, uint32_t length, uint16_t stride, ui
 
 uint32_t MeshDefinition::Blob::GetBufferSize() const
 {
-  return IsConsecutive() ? mLength : (mLength * mElementSizeHint / mStride);
+  return mLength;
 }
 
 void MeshDefinition::Blob::ComputeMinMax(uint32_t numComponents, uint32_t count, float* values)

diff --git a/dali-scene3d/public-api/loader/node-definition.cpp b/dali-scene3d/public-api/loader/node-definition.cpp
index 3a8e205..022ccd2 100644 (file)
--- a/dali-scene3d/public-api/loader/node-definition.cpp
+++ b/dali-scene3d/public-api/loader/node-definition.cpp
@@ -235,20 +235,10 @@ void ModelNode::OnCreate(const NodeDefinition& node, NodeDefinition::CreateParam
   actor.RegisterProperty(IBL_INTENSITY_STRING.data(), resources.mEnvironmentMaps[envIdx].first.mIblIntensity);
   actor.RegisterProperty(IBL_Y_DIRECTION.data(), resources.mEnvironmentMaps[envIdx].first.mYDirection);
 
-  float opaque      = 0.0f;
-  float mask        = 0.0f;
+  float opaque      = matDef.mIsOpaque ? 1.0f : 0.0f;
+  float mask        = matDef.mIsMask ? 1.0f : 0.0f;
   float alphaCutoff = matDef.GetAlphaCutoff();
-  if(!MaskMatch(matDef.mFlags, MaterialDefinition::TRANSPARENCY))
-  {
-    opaque = 1.0f;
-  }
-  else
-  {
-    if(alphaCutoff > 0.f)
-    {
-      mask = 1.0f;
-    }
-  }
+
   actor.RegisterProperty("uOpaque", opaque);
   actor.RegisterProperty("uMask", mask);
   actor.RegisterProperty("uAlphaThreshold", alphaCutoff);

diff --git a/dali-scene3d/public-api/loader/shader-definition-factory.cpp b/dali-scene3d/public-api/loader/shader-definition-factory.cpp
index 92ed552..37638b5 100644 (file)
--- a/dali-scene3d/public-api/loader/shader-definition-factory.cpp
+++ b/dali-scene3d/public-api/loader/shader-definition-factory.cpp
@@ -103,6 +103,16 @@ uint64_t HashNode(const NodeDefinition& nodeDef, const MaterialDefinition& mater
     hash.Add("EMIS" /*SIVE*/);
   }
 
+  if(MaskMatch(materialDef.mFlags, MaterialDefinition::SPECULAR))
+  {
+    hash.Add("SPECTEX");
+  }
+
+  if(MaskMatch(materialDef.mFlags, MaterialDefinition::SPECULAR_COLOR))
+  {
+    hash.Add("SPECCOLTEX");
+  }
+
   if(MaskMatch(materialDef.mFlags, MaterialDefinition::GLTF_CHANNELS))
   {
     hash.Add("GLTF" /*_CHANNELS*/);
@@ -244,24 +254,24 @@ Index ShaderDefinitionFactory::ProduceShader(const NodeDefinition& nodeDef)
     shaderDef.mDefines.push_back("SSS");
   }
 
-  if(MaskMatch(materialDef.mFlags, MaterialDefinition::SPECULAR))
+  if(MaskMatch(materialDef.mFlags, MaterialDefinition::OCCLUSION))
   {
-    shaderDef.mDefines.push_back("MATERIAL_SPECULAR_TEXTURE");
+    shaderDef.mDefines.push_back("OCCLUSION");
   }
 
-  if(MaskMatch(materialDef.mFlags, MaterialDefinition::SPECULAR_COLOR))
+  if(MaskMatch(materialDef.mFlags, MaterialDefinition::EMISSIVE))
   {
-    shaderDef.mDefines.push_back("MATERIAL_SPECULAR_COLOR_TEXTURE");
+    shaderDef.mDefines.push_back("EMISSIVE");
   }
 
-  if(MaskMatch(materialDef.mFlags, MaterialDefinition::OCCLUSION))
+  if(MaskMatch(materialDef.mFlags, MaterialDefinition::SPECULAR))
   {
-    shaderDef.mDefines.push_back("OCCLUSION");
+    shaderDef.mDefines.push_back("MATERIAL_SPECULAR_TEXTURE");
   }
 
-  if(MaskMatch(materialDef.mFlags, MaterialDefinition::EMISSIVE))
+  if(MaskMatch(materialDef.mFlags, MaterialDefinition::SPECULAR_COLOR))
   {
-    shaderDef.mDefines.push_back("EMISSIVE");
+    shaderDef.mDefines.push_back("MATERIAL_SPECULAR_COLOR_TEXTURE");
   }
 
   if(MaskMatch(materialDef.mFlags, MaterialDefinition::GLTF_CHANNELS))