首页 发现 帮助
注册 登录
zhangyupeng
/
Babylon.js
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

Merge pull request #272 from Palmer-JC/Automaton

TOB 1.0.1 fixes:
deltakosh 11 年之前
父节点
6b155186e8 ae718fdf59
当前提交
c73bafc464
共有 9 个文件被更改，包括 253 次插入 和 75 次删除
合并视图 显示文件统计
  1. 25 2
      Exporters/Blender/blender-test/armature_JSON.html
  2. 22 1
      Exporters/Blender/blender-test/armature_inline.html
  3. 二进制
      Exporters/Blender/blender-test/blender-in/mesh_parent.blend
  4. 24 1
      Exporters/Blender/blender-test/camera_anim_JSON.html
  5. 21 2
      Exporters/Blender/blender-test/camera_anim_inline.html
  6. 53 0
      Exporters/Blender/blender-test/lib/mesh_parent_common.js
  7. 15 1
      Exporters/Blender/blender-test/mesh_parent_JSON.html
  8. 16 0
      Exporters/Blender/blender-test/mesh_parent_inline.html
  9. 77 68
      Exporters/Blender/io_tower_of_babel.py

+ 25 - 2
Exporters/Blender/blender-test/armature_JSON.html
查看文件 

@@ -7,9 +7,20 @@
 
     <style>
 
     <style>
 
          html, body   { width: 100%; height: 100%; margin: 0; padding: 0; overflow: hidden; } 
          html, body   { width: 100%; height: 100%; margin: 0; padding: 0; overflow: hidden; } 
          #renderCanvas{ width: 100%; height: 100%; } 
          #renderCanvas{ width: 100%; height: 100%; } 
+         #button      {
 
+			color: white; background-color: Dimgray;
 
+			font-size: 14pt; font-weight: bold;
 
+			padding-left:4pt; padding-right:4pt;
 
+			
+			border: black outset 2pt; line-height: 2em;
 
+			cursor: pointer;
 
+		}     
     </style>
 
     </style>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
+	<div id="buttonbar" style="background-color: Darkorange;">
 
+		<span id="button" onclick="pausePlay()"> Pause - Play </span>
 
+	</div>
 
 <canvas id="renderCanvas"></canvas>
 
 <canvas id="renderCanvas"></canvas>
 
 <script>
 
 <script>
 
     if (BABYLON.Engine.isSupported()) {
 
     if (BABYLON.Engine.isSupported()) {
 
@@ -17,13 +28,19 @@
 
         var engine = new BABYLON.Engine(canvas, true);
 
         var engine = new BABYLON.Engine(canvas, true);
 
         console.log("Babylon version:  " + BABYLON.Engine.Version);
 
         console.log("Babylon version:  " + BABYLON.Engine.Version);
 
 
 
+        var running = true;
 
+        var skeleton;
 
+        var scene;
 
         var url = "./TOB-out/"; // edit when .babylon / texture files in a different dir than html
 
         var url = "./TOB-out/"; // edit when .babylon / texture files in a different dir than html
 
         BABYLON.SceneLoader.Load(url, "armature.babylon", engine, 
         BABYLON.SceneLoader.Load(url, "armature.babylon", engine, 
             function (newScene) {
 
             function (newScene) {
 
+      	        scene = newScene; // assign so visible external function
 
+      	        
                 newScene.executeWhenReady(function () {
 
                 newScene.executeWhenReady(function () {
 
-                    var skeleton = newScene.getSkeletonById(0);
 
+                    skeleton = newScene.getSkeletonById(0); // leave integer due to legacy exporter
 
                     newScene.beginAnimation(skeleton, 1, 45, true, 1);
 
                     newScene.beginAnimation(skeleton, 1, 45, true, 1);
 
-                    // Attach camera to canvas inputs
 
+                    
+                   // Attach camera to canvas inputs
 
                     newScene.activeCamera.attachControl(canvas);
 
                     newScene.activeCamera.attachControl(canvas);
 
 
 
                     // Once the scene is loaded, register a render loop
 
                     // Once the scene is loaded, register a render loop
 
@@ -46,6 +63,12 @@
 
     window.addEventListener("resize", function () {
 
     window.addEventListener("resize", function () {
 
         engine.resize();
 
         engine.resize();
 
     });
 
     });
 
+    function pausePlay() {
 
+        var animatable = scene.getAnimatableByTarget(skeleton);
 
+    	if (!running)animatable.restart();
 
+    	else animatable.pause();
 
+    	running = !running;
 
+    }
 
 </script>
 
 </script>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 22 - 1
Exporters/Blender/blender-test/armature_inline.html
查看文件 

@@ -8,9 +8,20 @@
 
     <style>
 
     <style>
 
          html, body   { width: 100%; height: 100%; margin: 0; padding: 0; overflow: hidden; } 
          html, body   { width: 100%; height: 100%; margin: 0; padding: 0; overflow: hidden; } 
          #renderCanvas{ width: 100%; height: 100%; } 
          #renderCanvas{ width: 100%; height: 100%; } 
+         #button      {
 
+			color: white; background-color: Dimgray;
 
+			font-size: 14pt; font-weight: bold;
 
+			padding-left:4pt; padding-right:4pt;
 
+			
+			border: black outset 2pt; line-height: 2em;
 
+			cursor: pointer;
 
+		}     
     </style>
 
     </style>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
+	<div id="buttonbar" style="background-color: Darkorange;">
 
+		<span id="button" onclick="pausePlay()"> Pause - Play </span>
 
+	</div>
 
 <canvas id="renderCanvas"></canvas>
 
 <canvas id="renderCanvas"></canvas>
 
 <script>
 
 <script>
 
     if (BABYLON.Engine.isSupported()) {
 
     if (BABYLON.Engine.isSupported()) {
 
@@ -21,8 +32,11 @@
 
         var scene = new BABYLON.Scene(engine);
 
         var scene = new BABYLON.Scene(engine);
 
         materialsRootDir = "./TOB-out"; // edit when texture files in a different dir than html
 
         materialsRootDir = "./TOB-out"; // edit when texture files in a different dir than html
 
         armature.initScene(scene, materialsRootDir);
 
         armature.initScene(scene, materialsRootDir);
 
-        var skeleton = scene.getSkeletonById(0);
 
+        
+        var skeleton = scene.getSkeletonById("0"); // string required for .js & .ts
 
         scene.beginAnimation(skeleton, 1, 45, true, 1);
 
         scene.beginAnimation(skeleton, 1, 45, true, 1);
 
+        var running = true;
 
+        
         scene.activeCamera.attachControl(canvas);
 
         scene.activeCamera.attachControl(canvas);
 
         engine.runRenderLoop(function () {
 
         engine.runRenderLoop(function () {
 
             scene.render();
 
             scene.render();
 
@@ -37,6 +51,13 @@
 
     window.addEventListener("resize", function () {
 
     window.addEventListener("resize", function () {
 
         engine.resize();
 
         engine.resize();
 
     });
 
     });
 
+	
+    function pausePlay() {
 
+        var animatable = scene.getAnimatableByTarget(skeleton);
 
+    	if (!running)animatable.restart();
 
+    	else animatable.pause();
 
+    	running = !running;
 
+    }
 
 </script>
 
 </script>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

二进制
Exporters/Blender/blender-test/blender-in/mesh_parent.blend
查看文件


+ 24 - 1
Exporters/Blender/blender-test/camera_anim_JSON.html
查看文件 

@@ -7,9 +7,20 @@
 
     <style>
 
     <style>
 
          html, body   { width: 100%; height: 100%; margin: 0; padding: 0; overflow: hidden; } 
          html, body   { width: 100%; height: 100%; margin: 0; padding: 0; overflow: hidden; } 
          #renderCanvas{ width: 100%; height: 100%; } 
          #renderCanvas{ width: 100%; height: 100%; } 
+         #button      {
 
+			color: white; background-color: Dimgray;
 
+			font-size: 14pt; font-weight: bold;
 
+			padding-left:4pt; padding-right:4pt;
 
+			
+			border: black outset 2pt; line-height: 2em;
 
+			cursor: pointer;
 
+		}     
     </style>
 
     </style>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
+	<div id="buttonbar" style="background-color: Darkorange;">
 
+		<span id="button" onclick="pausePlay()"> Pause - Play </span>
 
+	</div>
 
 <canvas id="renderCanvas"></canvas>
 
 <canvas id="renderCanvas"></canvas>
 
 <script>
 
 <script>
 
     if (BABYLON.Engine.isSupported()) {
 
     if (BABYLON.Engine.isSupported()) {
 
@@ -17,12 +28,17 @@
 
         var engine = new BABYLON.Engine(canvas, true);
 
         var engine = new BABYLON.Engine(canvas, true);
 
         console.log("Babylon version:  " + BABYLON.Engine.Version);
 
         console.log("Babylon version:  " + BABYLON.Engine.Version);
 
 
 
+        var running = true;
 
+        var myCam;
 
+        var scene;
 
         var url = "./TOB-out/" // edit when .babylon / texture files in a different dir than html
 
         var url = "./TOB-out/" // edit when .babylon / texture files in a different dir than html
 
         BABYLON.SceneLoader.Load(url, "camera_anim.babylon", engine, 
         BABYLON.SceneLoader.Load(url, "camera_anim.babylon", engine, 
             function (newScene) {
 
             function (newScene) {
 
+        	    scene = newScene; // assign so visible external function
 
+        	    
                 newScene.executeWhenReady(function () {
 
                 newScene.executeWhenReady(function () {
 
                     myCam = newScene.getCameraByName("Camera");
 
                     myCam = newScene.getCameraByName("Camera");
 
-                    myLight = newScene.getLightByID("Point"); 
+                    var myLight = newScene.getLightByID("Point"); 
                     myLight.parent = myCam;
 
                     myLight.parent = myCam;
 
                     // Attach camera to canvas inputs
 
                     // Attach camera to canvas inputs
 
                     newScene.activeCamera.attachControl(canvas);
 
                     newScene.activeCamera.attachControl(canvas);
 
@@ -47,6 +63,13 @@
 
     window.addEventListener("resize", function () {
 
     window.addEventListener("resize", function () {
 
         engine.resize();
 
         engine.resize();
 
     });
 
     });
 
+	
+    function pausePlay() {
 
+        var animatable = scene.getAnimatableByTarget(myCam);
 
+    	if (!running)animatable.restart();
 
+    	else animatable.pause();
 
+    	running = !running;
 
+    }
 
 </script>
 
 </script>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 21 - 2
Exporters/Blender/blender-test/camera_anim_inline.html
查看文件 

@@ -8,9 +8,20 @@
 
     <style>
 
     <style>
 
          html, body   { width: 100%; height: 100%; margin: 0; padding: 0; overflow: hidden; } 
          html, body   { width: 100%; height: 100%; margin: 0; padding: 0; overflow: hidden; } 
          #renderCanvas{ width: 100%; height: 100%; } 
          #renderCanvas{ width: 100%; height: 100%; } 
+         #button      {
 
+			color: white; background-color: Dimgray;
 
+			font-size: 14pt; font-weight: bold;
 
+			padding-left:4pt; padding-right:4pt;
 
+			
+			border: black outset 2pt; line-height: 2em;
 
+			cursor: pointer;
 
+		}     
     </style>
 
     </style>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
+	<div id="buttonbar" style="background-color: Darkorange;">
 
+		<span id="button" onclick="pausePlay()"> Pause - Play </span>
 
+	</div>
 
 <canvas id="renderCanvas"></canvas>
 
 <canvas id="renderCanvas"></canvas>
 
 <script>
 
 <script>
 
     if (BABYLON.Engine.isSupported()) {
 
     if (BABYLON.Engine.isSupported()) {
 
@@ -22,8 +33,9 @@
 
         materialsRootDir = "./TOB-out"; // edit when texture files in a different dir than html
 
         materialsRootDir = "./TOB-out"; // edit when texture files in a different dir than html
 
         camera_anim.initScene(scene, materialsRootDir);
 
         camera_anim.initScene(scene, materialsRootDir);
 
         
         
-        myCam = scene.getCameraByName("Camera");
 
-        myLight = scene.getLightByID("Point"); 
+        var running = true;
 
+        var myCam = scene.getCameraByName("Camera");
 
+        var myLight = scene.getLightByID("Point"); 
         myLight.parent = myCam;
 
         myLight.parent = myCam;
 
         scene.activeCamera.attachControl(canvas);
 
         scene.activeCamera.attachControl(canvas);
 
         engine.runRenderLoop(function () {
 
         engine.runRenderLoop(function () {
 
@@ -39,6 +51,13 @@
 
     window.addEventListener("resize", function () {
 
     window.addEventListener("resize", function () {
 
         engine.resize();
 
         engine.resize();
 
     });
 
     });
 
+	
+    function pausePlay() {
 
+        var animatable = scene.getAnimatableByTarget(myCam);
 
+    	if (!running)animatable.restart();
 
+    	else animatable.pause();
 
+    	running = !running;
 
+    }
 
 </script>
 
 </script>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 53 - 0
Exporters/Blender/blender-test/lib/mesh_parent_common.js
查看文件 

@@ -0,0 +1,53 @@
 
+/**
 
+ *  central location for mesh_parent script, called by mesh_parent_JSON.html & mesh_parent_inline.html 
+ */
 
+var breadMan;
 
+var ground;
 
+var meshes;
 
+var delta = new BABYLON.Vector3(0, 0, -.1);
 
+var running = true;
 
+var parenting = true;
 
+definedFacingForward = true;
 
+        
+function animate(scene){
 
+	if (!breadMan) breadMan = scene.getMeshByID("Gus");
 
+	if (!ground  ) ground   = scene.getMeshByID("Ground");
 
+	if (!meshes  ) meshes   = scene.meshes;
 
+	
+	if (running){
 
+		breadMan.rotation.y += 0.02;
 
+	    breadMan.rotation.z += 0.02;
 
+	    movePOV(0, 0, 0.1);
 
+	}        	
+}
 
+/**  "Borrowed" from Automaton
 
+ * Perform relative position change from the the point of view of behind the front of the mesh.
 
+ * This is performed taking into account the meshes current rotation, so you do not have to care.
 
+ * @param {number} amountRight
 
+ * @param {number} amountUp
 
+ * @param {number} amountForward
 
+ */
 
+ function movePOV(amountRight, amountUp, amountForward) {
 
+     var rotMatrix = new BABYLON.Matrix();
 
+     var rotQuaternion = (breadMan.rotationQuaternion) ? breadMan.rotationQuaternion : BABYLON.Quaternion.RotationYawPitchRoll(breadMan.rotation.y, breadMan.rotation.x, breadMan.rotation.z);
 
+     rotQuaternion.toRotationMatrix(rotMatrix);
 
+     
+     var translationDelta = BABYLON.Vector3.Zero();
 
+     var defForwardMult = definedFacingForward ? -1 : 1;
 
+     BABYLON.Vector3.TransformCoordinatesFromFloatsToRef(amountRight * defForwardMult, amountUp, amountForward * defForwardMult, rotMatrix, translationDelta);
 
+     breadMan.position.addInPlace(translationDelta);
 
+ };
 
+ 
+ function pausePlay() {
 
+ 	running = !running;
 
+ }
 
+ 
+ function orphanConceive() {
 
+	 console.log("in orphan ");
 
+	 parenting = !parenting;
 
+     for (index = 0; index < meshes.length; index++) {
 
+         var mesh = meshes[index];
 
+         if (mesh === breadMan || mesh === ground) continue;
 
+         mesh.parent = parenting ? breadMan : null;
 
+     }
 
+ }

+ 15 - 1
Exporters/Blender/blender-test/mesh_parent_JSON.html
查看文件 

@@ -4,12 +4,25 @@
 
     <title>mesh_parent</title>
 
     <title>mesh_parent</title>
 
     <!-- edit path - name of babylon library as required -->
 
     <!-- edit path - name of babylon library as required -->
 
     <script src="./lib/babylon.js"></script>
 
     <script src="./lib/babylon.js"></script>
 
+    <script src="./lib/mesh_parent_common.js"></script>
 
     <style>
 
     <style>
 
          html, body   { width: 100%; height: 100%; margin: 0; padding: 0; overflow: hidden; } 
          html, body   { width: 100%; height: 100%; margin: 0; padding: 0; overflow: hidden; } 
          #renderCanvas{ width: 100%; height: 100%; } 
          #renderCanvas{ width: 100%; height: 100%; } 
+         #button      {
 
+			color: white; background-color: Dimgray;
 
+			font-size: 14pt; font-weight: bold;
 
+			padding-left:4pt; padding-right:4pt;
 
+			
+			border: black outset 2pt; line-height: 2em;
 
+			cursor: pointer;
 
+		}     
     </style>
 
     </style>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
+	<div id="buttonbar" style="background-color: Darkorange;">
 
+		<span id="button" onclick="pausePlay()"> Pause - Play </span>
 
+		<span id="button" onclick="orphanConceive()"> Orhpan - Conceive </span>
 
+	</div>
 
 <canvas id="renderCanvas"></canvas>
 
 <canvas id="renderCanvas"></canvas>
 
 <script>
 
 <script>
 
     if (BABYLON.Engine.isSupported()) {
 
     if (BABYLON.Engine.isSupported()) {
 
@@ -23,9 +36,10 @@
 
                 newScene.executeWhenReady(function () {
 
                 newScene.executeWhenReady(function () {
 
                     // Attach camera to canvas inputs
 
                     // Attach camera to canvas inputs
 
                     newScene.activeCamera.attachControl(canvas);
 
                     newScene.activeCamera.attachControl(canvas);
 
-
 
+                   
                     // Once the scene is loaded, register a render loop
 
                     // Once the scene is loaded, register a render loop
 
                     engine.runRenderLoop(function() {
 
                     engine.runRenderLoop(function() {
 
+                    	animate(newScene);
 
                         newScene.render();
 
                         newScene.render();
 
                     });
 
                     });
 
                 });
 
                 });

+ 16 - 0
Exporters/Blender/blender-test/mesh_parent_inline.html
查看文件 

@@ -5,12 +5,25 @@
 
     <!-- edit path - name of babylon library as required -->
 
     <!-- edit path - name of babylon library as required -->
 
     <script src="./lib/babylon.js"></script>
 
     <script src="./lib/babylon.js"></script>
 
     <script src="./TOB-out/mesh_parent.js"></script>
 
     <script src="./TOB-out/mesh_parent.js"></script>
 
+    <script src="./lib/mesh_parent_common.js"></script>
 
     <style>
 
     <style>
 
          html, body   { width: 100%; height: 100%; margin: 0; padding: 0; overflow: hidden; } 
          html, body   { width: 100%; height: 100%; margin: 0; padding: 0; overflow: hidden; } 
          #renderCanvas{ width: 100%; height: 100%; } 
          #renderCanvas{ width: 100%; height: 100%; } 
+         #button      {
 
+			color: white; background-color: Dimgray;
 
+			font-size: 14pt; font-weight: bold;
 
+			padding-left:4pt; padding-right:4pt;
 
+			
+			border: black outset 2pt; line-height: 2em;
 
+			cursor: pointer;
 
+		}     
     </style>
 
     </style>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
+	<div id="buttonbar" style="background-color: Darkorange;">
 
+		<span id="button" onclick="pausePlay()"> Pause - Play </span>
 
+		<span id="button" onclick="orphanConceive()"> Orhpan - Conceive </span>
 
+	</div>
 
 <canvas id="renderCanvas"></canvas>
 
 <canvas id="renderCanvas"></canvas>
 
 <script>
 
 <script>
 
     if (BABYLON.Engine.isSupported()) {
 
     if (BABYLON.Engine.isSupported()) {
 
@@ -22,7 +35,9 @@
 
         materialsRootDir = "./TOB-out"; // edit when texture files in a different dir than html
 
         materialsRootDir = "./TOB-out"; // edit when texture files in a different dir than html
 
         mesh_parent.initScene(scene, materialsRootDir);
 
         mesh_parent.initScene(scene, materialsRootDir);
 
         scene.activeCamera.attachControl(canvas);
 
         scene.activeCamera.attachControl(canvas);
 
+        
         engine.runRenderLoop(function () {
 
         engine.runRenderLoop(function () {
 
+            animate(scene);
 
             scene.render();
 
             scene.render();
 
         });
 
         });
 
     }else{
 
     }else{
 
@@ -35,6 +50,7 @@
 
     window.addEventListener("resize", function () {
 
     window.addEventListener("resize", function () {
 
         engine.resize();
 
         engine.resize();
 
     });
 
     });
 
+    
 </script>
 
 </script>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 77 - 68
Exporters/Blender/io_tower_of_babel.py
查看文件 

@@ -1,7 +1,7 @@
 
 bl_info = {

 bl_info = {

     'name': 'Tower of Babel',

     'name': 'Tower of Babel',

     'author': 'David Catuhe, Jeff Palmer',

     'author': 'David Catuhe, Jeff Palmer',

-    'version': (1, 0, 0),

+    'version': (1, 0, 1),

     'blender': (2, 69, 0),

     'blender': (2, 69, 0),

     'location': 'File > Export > Tower of Babel [.babylon + .js + .ts + .html(s)]',

     'location': 'File > Export > Tower of Babel [.babylon + .js + .ts + .html(s)]',

     'description': 'Produce Babylon scene file (.babylon), Translate to inline JavaScript & TypeScript',

     'description': 'Produce Babylon scene file (.babylon), Translate to inline JavaScript & TypeScript',

@@ -209,6 +209,7 @@ class TowerOfBabel(bpy.types.Operator, bpy_extras.io_utils.ExportHelper):
 
             else:

             else:

                 TowerOfBabel.nameSpace = legal_js_identifier(self.filepathMinusExtension.rpartition('/')[2])

                 TowerOfBabel.nameSpace = legal_js_identifier(self.filepathMinusExtension.rpartition('/')[2])

 

 

+            TowerOfBabel.nWarnings = 0 # explicitly reset, incase there was an earlier export this session

             TowerOfBabel.log_handler = open(self.filepathMinusExtension + '.log', 'w')

             TowerOfBabel.log_handler = open(self.filepathMinusExtension + '.log', 'w')

             TOB_version = bl_info['version']

             TOB_version = bl_info['version']

             TowerOfBabel.log('Tower of Babel version: ' + str(TOB_version[0]) + '.' + str(TOB_version[1]) +  '.' + str(TOB_version[2]) + 

             TowerOfBabel.log('Tower of Babel version: ' + str(TOB_version[0]) + '.' + str(TOB_version[1]) +  '.' + str(TOB_version[2]) + 

@@ -367,7 +368,16 @@ class TowerOfBabel(bpy.types.Operator, bpy_extras.io_utils.ExportHelper):
 
         # Meshes

         # Meshes

         file_handler.write(',\n"meshes":[')

         file_handler.write(',\n"meshes":[')

         first = True

         first = True

-        for mesh in reversed(self.meshesAndNodes): # reversed for shared vertex instances

+        for m in range(0, len(self.meshesAndNodes)):

+            mesh = self.meshesAndNodes[m]

+            

+            # skip if mesh already written by that name, since this one is an instance

+            skip = False

+            for n in range(0, m):

+                skip |= mesh.dataName == self.meshesAndNodes[n].dataName # nodes have no dataname, so no need to check for

+             

+            if skip: continue

+                

             if first != True:

             if first != True:

                 file_handler.write(',')

                 file_handler.write(',')

 

 

@@ -753,7 +763,6 @@ class Mesh(FCurveAnimatable):
 
         

         

         # used to support shared vertex instances in later passed

         # used to support shared vertex instances in later passed

         self.dataName = object.data.name

         self.dataName = object.data.name

-        self.alreadyExported = False

 

 

         if forcedParent is None:     

         if forcedParent is None:     

             if object.parent and object.parent.type != 'ARMATURE':

             if object.parent and object.parent.type != 'ARMATURE':

@@ -859,7 +868,6 @@ class Mesh(FCurveAnimatable):
 
             self.skeletonIndicesCompressed = []

             self.skeletonIndicesCompressed = []

     

     

         # used tracking of vertices as they are recieved     

         # used tracking of vertices as they are recieved     

-        orderMapToNative = []

         alreadySavedVertices = []

         alreadySavedVertices = []

         vertices_UVs = []

         vertices_UVs = []

         vertices_UV2s = []

         vertices_UV2s = []

@@ -869,7 +877,6 @@ class Mesh(FCurveAnimatable):
 
         self.offsetFace = 0

         self.offsetFace = 0

                 

                 

         for v in range(0, len(mesh.vertices)):

         for v in range(0, len(mesh.vertices)):

-            orderMapToNative.append(-1)

             alreadySavedVertices.append(False)

             alreadySavedVertices.append(False)

             vertices_UVs.append([])

             vertices_UVs.append([])

             vertices_UV2s.append([])

             vertices_UV2s.append([])

@@ -988,7 +995,6 @@ class Mesh(FCurveAnimatable):
 
                     else:

                     else:

                         # Export new one

                         # Export new one

                         index = verticesCount

                         index = verticesCount

-                        orderMapToNative[vertex_index] = index

                         alreadySavedVertices[vertex_index] = True

                         alreadySavedVertices[vertex_index] = True

                         if hasUV:

                         if hasUV:

                             vertices_UVs[vertex_index].append(vertex_UV)

                             vertices_UVs[vertex_index].append(vertex_UV)

@@ -1040,40 +1046,60 @@ class Mesh(FCurveAnimatable):
 
         

         

         # shape keys for mesh 

         # shape keys for mesh 

         if object.data.shape_keys:

         if object.data.shape_keys:

-            rawShapeKeys = []

-            groupNames = []

+            basisFound = False

             for block in object.data.shape_keys.key_blocks:

             for block in object.data.shape_keys.key_blocks:

-                # perform name format validation, before processing

-                keyName = block.name

+                if (block.name == 'Basis'):

+                    keyOrderMap = self.get_key_order_map(block)

+                    basisFound = True

+                    break

+                

+            if not basisFound:

+                TowerOfBabel.warn('WARNING: Basis key missing, shape-key processing NOT performed', 2)

+            

+            else:

+                rawShapeKeys = []

+                groupNames = []

+                for block in object.data.shape_keys.key_blocks:

+                    # perform name format validation, before processing

+                    keyName = block.name

                 

                 

-                # the Basis shape key is a member of all groups, each automatically built from positions, Blender version ignored

-                if (keyName == 'Basis'): continue

+                    # the Basis shape key is a member of all groups, each automatically built from positions, Blender version ignored

+                    if (keyName == 'Basis'): continue

                 

                 

-                if (keyName.find('-') <= 0):

-                    keyName = 'ENTIRE MESH-' + keyName.upper();

-                    TowerOfBabel.log('Key shape not in group-state format, changed to:  ' + keyName, 2)

+                    if (keyName.find('-') <= 0):

+                        keyName = 'ENTIRE MESH-' + keyName.upper();

+                        TowerOfBabel.warn('WARNING: Key shape not in group-state format, changed to:  ' + keyName, 2)

                     

                     

-                temp = keyName.upper().partition('-')

-                if len(block.data) != len(self.positions):

-                    TowerOfBabel.warn('WARNING: shape key length != positions length, either missing UV map, or mesh too large:  '+ keyName, 2)

-                    continue

-                        

-                rawShapeKeys.append(RawShapeKey(block, temp[0], temp[2], orderMapToNative))

+                    temp = keyName.upper().partition('-')

+                    rawShapeKeys.append(RawShapeKey(block, temp[0], temp[2], keyOrderMap))

                 

                 

-                # check for a new group, add to groupNames if so

-                newGroup = True

-                for group in groupNames:

-                    if temp[0] == group:

-                        newGroup = False

-                        break

-                if newGroup:

-                    groupNames.append(temp[0])

+                    # check for a new group, add to groupNames if so

+                    newGroup = True

+                    for group in groupNames:

+                        if temp[0] == group:

+                            newGroup = False

+                            break

+                    if newGroup:

+                       groupNames.append(temp[0])

                     

                     

-            # process into ShapeKeyGroups, when rawShapeKeys found

-            if (len(groupNames) > 0):

-                self.shapeKeyGroups = []

-                for group in groupNames:

-                    self.shapeKeyGroups.append(ShapeKeyGroup(group, rawShapeKeys, self.positions))

+                # process into ShapeKeyGroups, when rawShapeKeys found

+                if (len(groupNames) > 0):

+                    self.shapeKeyGroups = []

+                    for group in groupNames:

+                        self.shapeKeyGroups.append(ShapeKeyGroup(group, rawShapeKeys, self.positions))

+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

+    def get_key_order_map(self, basisKey):

+        basisData = basisKey.data

+        keySz =len(basisData)

+        

+        ret = []

+        positionsSz = len(self.positions)

+        for posIdx in range(0, positionsSz):

+            for keyIdx in range(0, keySz):

+                if same_vertex(basisData[keyIdx].co, self.positions[posIdx]): 

+                    ret.append(keyIdx)

+                    break

+        return ret

 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

     def get_proper_name(self):

     def get_proper_name(self):

         return legal_js_identifier(self.name)

         return legal_js_identifier(self.name)

@@ -1095,8 +1121,6 @@ class Mesh(FCurveAnimatable):
 
             pass

             pass

 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -      

 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -      

     def to_scene_file(self, file_handler, meshesAndNodes): 

     def to_scene_file(self, file_handler, meshesAndNodes): 

-        if self.alreadyExported: return

-        

         file_handler.write('{')        

         file_handler.write('{')        

         write_string(file_handler, 'name', self.name, True)        

         write_string(file_handler, 'name', self.name, True)        

         write_string(file_handler, 'id', self.name) 

         write_string(file_handler, 'id', self.name) 

@@ -1155,8 +1179,7 @@ class Mesh(FCurveAnimatable):
 
         first = True

         first = True

         file_handler.write('\n,"instances":[')

         file_handler.write('\n,"instances":[')

         for mesh in meshesAndNodes:

         for mesh in meshesAndNodes:

-            if hasattr(mesh, 'positions') and mesh.dataName == self.dataName and mesh != self and not mesh.alreadyExported:  # check for positions to be sure not a Node

-                mesh.alreadyExported = True

+            if mesh.dataName == self.dataName and mesh != self:  # nodes have no dataname, so no need to check for

                 if first == False:

                 if first == False:

                     file_handler.write(',')

                     file_handler.write(',')

                 file_handler.write('{')

                 file_handler.write('{')

@@ -1482,17 +1505,14 @@ class SubMesh:
 
 #===============================================================================   

 #===============================================================================   

 # extract data in Mesh order, no optimization from group analyse yet

 # extract data in Mesh order, no optimization from group analyse yet

 class RawShapeKey:

 class RawShapeKey:

-    def __init__(self, keyBlock, group, state, orderMapToNative):

+    def __init__(self, keyBlock, group, state, keyOrderMap):

         self.group = group

         self.group = group

         self.state = state

         self.state = state

         self.vertices = []   

         self.vertices = []   

 

 

-        max_index = len(orderMapToNative)

-        for lookingForIdx in range(0, max_index):

-            for nativeIdx in range(0, max_index):

-                if orderMapToNative[nativeIdx] == lookingForIdx:

-                   self.vertices.append(keyBlock.data[nativeIdx].co)

-                   break;

+        retSz = len(keyOrderMap)

+        for idx in range(0, retSz):

+            self.vertices.append(keyBlock.data[keyOrderMap[idx]].co)

 #===============================================================================

 #===============================================================================

 class ShapeKeyGroup:

 class ShapeKeyGroup:

     def __init__(self, group, rawShapeKeys, positions):

     def __init__(self, group, rawShapeKeys, positions):

@@ -1510,30 +1530,20 @@ class ShapeKeyGroup:
 
             

             

         # first pass to determine which vertices are not the same across all members of a group & also positions

         # first pass to determine which vertices are not the same across all members of a group & also positions

         for i in range(0, nSize):

         for i in range(0, nSize):

-            for keyA in rawShapeKeys:

+            for key in rawShapeKeys:

                 # no need for more checking once 1 difference is found

                 # no need for more checking once 1 difference is found

                 if not sameForAll[i]:

                 if not sameForAll[i]:

                     break;

                     break;

                     

                     

                 # skip key if not member of the current group being processed

                 # skip key if not member of the current group being processed

-                if group != keyA.group:

+                if group != key.group:

                     continue;

                     continue;

                     

                     

-                # check vertex not different from positions (done before inner loop for performance)

-                if not ShapeKeyGroup.same_vertex(keyA.vertices[i],  positions[i]):

+                # check vertex not different from positions, aka. Basis

+                if not same_vertex(key.vertices[i],  positions[i]):

                     sameForAll[i] = False

                     sameForAll[i] = False

                     break;

                     break;

                 

                 

-                # check vertices[i] of keyA against all other keys of this group 

-                for keyB in range(0, nRawKeys):

-                    # skip keyB if not member of the current group being processed, or itself

-                    if group != keyB.group or keyA == keyB:

-                         continue;

-                         

-                    if not ShapeKeyGroup.same_vertex(keyA.vertices[i],  keyB.vertices[i]):

-                       sameForAll[i] = False

-                       break;

-       

         affectedWholeVertices = []

         affectedWholeVertices = []

         affectedVertices = []

         affectedVertices = []

         # pass to convert sameForAll into self.affectedIndices, build 'BASIS' state at the same time

         # pass to convert sameForAll into self.affectedIndices, build 'BASIS' state at the same time

@@ -1546,7 +1556,7 @@ class ShapeKeyGroup:
 
                 affectedVertices.append(positions[i])

                 affectedVertices.append(positions[i])

                 

                 

         self.basisState = affectedVertices

         self.basisState = affectedVertices

-        TowerOfBabel.log('n Affected for ' + group + ': '+ str(len(affectedWholeVertices)) + ', of ' + str(nSize))

+        TowerOfBabel.log('Shape-key group, ' + group + ', # of affected vertices: '+ str(len(affectedWholeVertices)) + ', out of ' + str(nSize), 2)

                 

                 

         # pass to convert rawShapeKeys in this group, to stateVertices of only affected indices

         # pass to convert rawShapeKeys in this group, to stateVertices of only affected indices

         for key in rawShapeKeys:

         for key in rawShapeKeys:

@@ -1592,10 +1602,6 @@ class ShapeKeyGroup:
 
             file_handler.write(indent  + 'shapeKeyGroup.addShapeKey("' + self.stateNames[state_idx] + '",[\n')

             file_handler.write(indent  + 'shapeKeyGroup.addShapeKey("' + self.stateNames[state_idx] + '",[\n')

             file_handler.write(indent2 + format_vector_array(self.stateVertices[state_idx], VERTEX_OUTPUT_PER_LINE, indent2) + '\n')

             file_handler.write(indent2 + format_vector_array(self.stateVertices[state_idx], VERTEX_OUTPUT_PER_LINE, indent2) + '\n')

             file_handler.write(indent  + ']);\n')

             file_handler.write(indent  + ']);\n')

-            

-    @staticmethod

-    def same_vertex(vertA, vertB):

-        return vertA.x == vertB.x and vertA.y == vertB.y and vertA.z == vertB.z

 #===============================================================================

 #===============================================================================

 class Bone:

 class Bone:

     def __init__(self, bone, skeleton, scene, index):

     def __init__(self, bone, skeleton, scene, index):

@@ -1687,7 +1693,7 @@ class Skeleton:
 
     def to_scene_file(self, file_handler):

     def to_scene_file(self, file_handler):

         file_handler.write('{')

         file_handler.write('{')

         write_string(file_handler, 'name', self.name, True)

         write_string(file_handler, 'name', self.name, True)

-        write_int(file_handler, 'id', self.id)

+        write_int(file_handler, 'id', self.id)  # keep int for legacy of original exporter

         

         

         file_handler.write(',"bones":[')

         file_handler.write(',"bones":[')

         first = True

         first = True

@@ -1705,7 +1711,7 @@ class Skeleton:
 
     def core_script(self, file_handler, indent): 

     def core_script(self, file_handler, indent): 

         # specifying scene gets skeleton added to scene in constructor

         # specifying scene gets skeleton added to scene in constructor

         file_handler.write(indent + "console.log('defining skeleton:  " + self.name + "');\n")

         file_handler.write(indent + "console.log('defining skeleton:  " + self.name + "');\n")

-        file_handler.write(indent + 'skeleton = new BABYLON.Skeleton("' + self.name + '", "' + format_int(self.id) + '", scene);\n')

+        file_handler.write(indent + 'skeleton = new BABYLON.Skeleton("' + self.name + '", "' + format_int(self.id) + '", scene);\n') # MUST be String for inline

 

 

         for bone in self.bones:

         for bone in self.bones:

             bone.core_script(file_handler, indent)

             bone.core_script(file_handler, indent)

@@ -1928,7 +1934,7 @@ class ShadowGenerator:
 
 class MultiMaterial:

 class MultiMaterial:

     def __init__(self, material_slots, idx):

     def __init__(self, material_slots, idx):

         self.name = TowerOfBabel.nameSpace + '.' + 'Multimaterial#' + str(idx)

         self.name = TowerOfBabel.nameSpace + '.' + 'Multimaterial#' + str(idx)

-        TowerOfBabel.log('processing begun of multimaterial:  ' + self.name)

+        TowerOfBabel.log('processing begun of multimaterial:  ' + self.name, 2)

         self.materials = []

         self.materials = []

 

 

         for mat in material_slots:

         for mat in material_slots:

@@ -2309,7 +2315,7 @@ def format_quaternion(quaternion):
 
     return format_f(quaternion.x) + ',' + format_f(quaternion.z) + ',' + format_f(quaternion.y) + ',' + format_f(-quaternion.w)

     return format_f(quaternion.x) + ',' + format_f(quaternion.z) + ',' + format_f(quaternion.y) + ',' + format_f(-quaternion.w)

 

 

 def format_int(int):

 def format_int(int):

-    candidate = str(int) # when int string of an int, if

+    candidate = str(int) # when int string of an int

     if '.' in candidate:

     if '.' in candidate:

         return format_f(math.floor(int)) # format_f removes un-neccessary precision

         return format_f(math.floor(int)) # format_f removes un-neccessary precision

     else:

     else:

@@ -2328,6 +2334,9 @@ def scale_vector(vector, mult, xOffset = 0):
 
     ret.z *= mult

     ret.z *= mult

     ret.y *= mult

     ret.y *= mult

     return ret

     return ret

+           

+def same_vertex(vertA, vertB):

+    return vertA.x == vertB.x and vertA.y == vertB.y and vertA.z == vertB.z

 #===============================================================================

 #===============================================================================

 # module level methods for writing JSON (.babylon) files

 # module level methods for writing JSON (.babylon) files

 #===============================================================================

 #===============================================================================