[QUAL] - Flexible mask helper - add possibility to specify geometry n…

…ame for load_geometryFromGLTF() - see #1
WebAR-rocks · Sep 8, 2020 · 4736773 · 4736773
1 parent 69df4f9
commit 4736773
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/demos/flexibleMask/main.js b/demos/flexibleMask/main.js
@@ -141,7 +141,7 @@ function build_scene(threeInstances){
   //WebARRocksFaceHelper.add_threejsOccluderFromFile('assets/occluder.glb', null, threeLoadingManager);
 
   // build and add the flexible mask:
-  _flexibleMaskHelper.load_geometryFromGLTF(threeLoadingManager, _spec.flexibleMaskURL).then(function(geom){
+  _flexibleMaskHelper.load_geometryFromGLTF(threeLoadingManager, _spec.flexibleMaskURL, null).then(function(geom){
     const face3DKeypoints = (_spec.flexibleMaskPoints) ? _spec.flexibleMaskPoints : WebARRocksFaceHelper.get_facePointPositions();
     _flexibleMaskMesh = _flexibleMaskHelper.build_flexibleMask(geom, face3DKeypoints, {
       kpInfluenceDecay: _spec.kpInfluenceDecay // [ distance from the keypoint where decay start, distance from the keypoint where decay ends ]

diff --git a/helpers/WebARRocksFaceFlexibleMaskHelper.js b/helpers/WebARRocksFaceFlexibleMaskHelper.js
@@ -145,10 +145,10 @@ const WebARRocksFaceFlexibleMaskHelper = (function(){
   // END MISC HELPERS
 
   const that = {
-    load_geometryFromGLTF: function(loadingManager, GLTFUrl){
+    load_geometryFromGLTF: function(loadingManager, GLTFUrl, flexibleGeometryName){
       return new Promise(function(resolve, reject){
         new THREE.GLTFLoader(loadingManager).load(GLTFUrl, function(model){
-          const geom = that.extract_flexibleMaskGeometry(model.scene, null);
+          const geom = that.extract_flexibleMaskGeometry(model.scene, flexibleGeometryName);
           resolve(geom);
         }); //end GLTF loading
       }); //end return new Promise