@reactvision/react-viro 2.53.0 → 2.53.1

package/components/Utilities/ViroVersion.ts

@@ -1 +1 @@
-export const VIRO_VERSION = "2.53.0";
+export const VIRO_VERSION = "2.53.1";

package/components/Viro3DObject.tsx

@@ -30,7 +30,13 @@ type Props = {
    */
   resources?: ImageSourcePropType[];
   /**
-   * TODO: what does this do?
+   * Sets morph target weights for GLB/GLTF models that contain morph targets (blend shapes).
+   * Each entry pairs a target name (as exported from the model) with a blend weight in [0, 1].
+   *
+   * Example:
+   *   morphTargets={[{ target: "Smile", weight: 0.8 }, { target: "Blink", weight: 1.0 }]}
+   *
+   * Use getMorphTargets() to discover the available target names at runtime.
    */
   morphTargets?: Array<{
     target?: string;

package/dist/components/Utilities/ViroVersion.d.ts

@@ -1 +1 @@
-export declare const VIRO_VERSION = "2.53.0";
+export declare const VIRO_VERSION = "2.53.1";

package/dist/components/Utilities/ViroVersion.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VIRO_VERSION = void 0;
-exports.VIRO_VERSION = "2.53.0";
+exports.VIRO_VERSION = "2.53.1";

package/dist/components/Viro3DObject.d.ts

@@ -13,7 +13,13 @@ type Props = {
      */
     resources?: ImageSourcePropType[];
     /**
-     * TODO: what does this do?
+     * Sets morph target weights for GLB/GLTF models that contain morph targets (blend shapes).
+     * Each entry pairs a target name (as exported from the model) with a blend weight in [0, 1].
+     *
+     * Example:
+     *   morphTargets={[{ target: "Smile", weight: 0.8 }, { target: "Blink", weight: 1.0 }]}
+     *
+     * Use getMorphTargets() to discover the available target names at runtime.
      */
     morphTargets?: Array<{
         target?: string;

package/ios/dist/ViroRenderer/ViroKit.framework/Headers/VROGLTFLoader.h

@@ -119,7 +119,7 @@ private:
     static bool processCamera(const tinygltf::Model &gModel, std::shared_ptr<VRONode> &node, int cameraIndex);
     static bool processLight(const tinygltf::Model &gModel, std::shared_ptr<VRONode> &node, int lightIndex);
     static bool processMesh(const tinygltf::Model &gModel, std::shared_ptr<VRONode> &node, const tinygltf::Mesh &gMesh,
-                            std::shared_ptr<VRODriver> driver);
+                            int meshIndex, std::shared_ptr<VRODriver> driver);
     static bool processSkin(const tinygltf::Model &gModel, std::shared_ptr<VRONode> &node, int skinIndex);
     static bool processVertexElement(const tinygltf::Model &gModel, const tinygltf::Primitive &gPrimitive,
                                      std::vector<std::shared_ptr<VROGeometryElement>> &element);
@@ -186,7 +186,8 @@ private:
     static bool processKeyFrameAnimations(const tinygltf::Model &gModel,
                                          std::map<int, std::map<int, std::vector<int>>> &gltfAnimatedNodes);
     static void flattenSkeletalKeyframeAnimations(
-            std::map<int, std::pair<int, std::vector<int>>> &skeletalAnimToNodeSkinPair);
+            std::map<int, std::pair<int, std::vector<int>>> &skeletalAnimToNodeSkinPair,
+            int skinIndex);
     static std::shared_ptr<VROKeyframeAnimation> convertChannelToKeyFrameAnimation(
                                                   const tinygltf::Model &gModel,
                                                   const tinygltf::Animation &anim,
@@ -195,9 +196,11 @@ private:
                                       std::string channelProperty,
                                       int channelTarget,
                                       const tinygltf::AnimationSampler &gChannelSampler,
-                                      std::vector<std::unique_ptr<VROKeyframeAnimationFrame>> &framesOut);
+                                      std::vector<std::unique_ptr<VROKeyframeAnimationFrame>> &framesOut,
+                                      float animDuration = 1.0f);
+    // skeletalAnimToSkinToNodeMap: animIndex → vector of (skinIndex, animatedJointNodeIndices)
     static bool processSkeletalAnimation(const tinygltf::Model &gModel,
-                                         std::map<int, std::pair<int, std::vector<int>>> &skeletalAnimToSkinToNodeMap);
+                                         std::map<int, std::vector<std::pair<int, std::vector<int>>>> &skeletalAnimToSkinToNodeMap);
     static bool processSkeletalTransformsForFrame(const tinygltf::Model &gModel,
                                                   int skin,
                                                   int animation,
@@ -229,6 +232,14 @@ private:
     static std::map<int, std::shared_ptr<VROSkinner>> _skinMap;
     static std::map<int, int> _skinIndexToSkeletonRootJoint;
 
+    /*
+     Per-mesh bone attribute sources cached during processMesh so that processNode can wire them
+     into the VROSkinner once both mesh geometry and skin data are available.
+     Keyed by glTF mesh index.
+     */
+    static std::map<int, std::shared_ptr<VROGeometrySource>> _meshBoneIndices;
+    static std::map<int, std::shared_ptr<VROGeometrySource>> _meshBoneWeights;
+
     /*
      Cached maps of nodeIndexes to it's corresponding animations. These caches are cleared
      out after the parsing of a single gLTF model. Note that _nodeKeyFrameAnims is of the form:

package/package.json

@@ -3,7 +3,7 @@
   "main": "dist/index.js",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
-  "version": "2.53.0",
+  "version": "2.53.1",
   "license": "MIT",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"