add morph targets data #28 #24

but0n · Mar 27, 2019 · a789b14 · a789b14
1 parent 3afc285
commit a789b14
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/src/gltfScene.ts b/src/gltfScene.ts
@@ -55,22 +55,25 @@ export class gltfScene {
                     accessors.push(acc);
                 }
 
-                // if(targets) {
-                //     for (let target of targets) {
-                //         for (let tar in target) {
-                //             let acc: Accessor = gltf.accessors[target[tar]];
-                //             acc.attribute = '_' + tar;
-                //             accessors.push(acc);
-                //         }
-                //         break;
-                //     }
-                // }
 
                 // Triangles
                 let ebo = gltf.accessors[meshData.indices];
 
                 let mf = new Mesh(accessors, ebo, meshData.mode);
 
+                // Morph targets
+                if(targets) {
+                    mf.hasMorphTargets = true;
+                    for (let target of targets) {
+                        for (let tar in target) {
+                            let acc: Accessor = gltf.accessors[target[tar]];
+                            acc.attribute = tar;
+                            mf.targets[tar] = acc;
+                        }
+                        break;
+                    }
+                }
+
                 if (attributes.TANGENT == null && attributes.TEXCOORD_0 != null) {
                     console.warn('Using computed tagent!');
                     Mesh.preComputeTangent(mf);

diff --git a/src/mesh/mesh.ts b/src/mesh/mesh.ts
@@ -5,6 +5,9 @@ export class Mesh {
     // Render mode
     mode: number;
 
+    data = {};  // Raw data
+    hasMorphTargets = false;
+    targets = {};
 
     constructor(attributes: Accessor[], indices?: Accessor, mode = WebGL2RenderingContext.TRIANGLES) {
         this.attributes = attributes;
@@ -14,6 +17,11 @@ export class Mesh {
             this.indices.bufferView.target = WebGL2RenderingContext.ELEMENT_ARRAY_BUFFER;
         }
         this.mode = mode;
+        // reference mesh data
+        for(let attr of attributes) {
+            const name = attr.attribute;
+            this.data[name] = attr.data;
+        }
     }
 
     static bindAccessorsVBO(target: Mesh, gl: WebGL2RenderingContext, locationList) {