Merge pull request #2 from marcelosevergnini/develop

changed the animation type
marcelosevergnini · Jan 23, 2018 · d53b597 · d53b597
2 parents 8c63c66 + 3aa6f23
commit d53b597
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/src/assets/js/main.js b/src/assets/js/main.js
@@ -18,8 +18,6 @@ var demo = (function() {
         earthObject.earth.add(earthObject.cloudsMesh);
         earthObject.earth.add(sphereAxis);
         objectGroup.add(earthObject.earth);
-        objectToMove = UTIL.Functions.createSimpleSphere(0.5, 32, 32, 0, 0, 130);
-        objectGroup.add(objectToMove);
         scene.add(objectGroup);
     },
     createSkyBox = function(){

diff --git a/src/assets/js/tweens.js b/src/assets/js/tweens.js
@@ -6,12 +6,12 @@ TWEENS.runners.processId = 0;
 
 TWEENS.runners.createTweensByGeoPosition = function(dataList, cameraContainer, onStartExec, onCompleteExec){
 
-    TWEENS.runners.originalPosition = new TWEEN.Tween(cameraContainer.camera.position).to(cameraContainer.cameraOriginalPosition, 3000).easing(TWEEN.Easing.Quadratic.Out)
+    TWEENS.runners.originalPosition = new TWEEN.Tween(cameraContainer.camera.position).to(cameraContainer.cameraOriginalPosition, 3000).easing(TWEEN.Easing.Quadratic.In)
     .onStart(function(){
 
     })
     .onComplete(function(){
-        TWEENS.runners.processId = TWEENS.runners.processId + 1;
+        TWEENS.runners.processId += 1;
         if(TWEENS.runners.processId > dataList.length){
             TWEENS.runners.processId = 1;
         }
@@ -22,18 +22,15 @@ TWEENS.runners.createTweensByGeoPosition = function(dataList, cameraContainer, o
         var currentPosition = UTIL.Functions.convertLatLonToVec3(element.latitude,element.longitude).multiplyScalar(52.5);
         //var current = { x: cameraContainer.camera.position.x, y: cameraContainer.camera.position.y, z: cameraContainer.camera.position.z  };
         //var target = { x: (currentPosition.x), y: (currentPosition.y), z: 0};
-        var currentTween = new TWEEN.Tween(cameraContainer.camera.position).to(currentPosition, 2000).easing(TWEEN.Easing.Back.InOut)
+        var currentTween = new TWEEN.Tween(cameraContainer.camera.position).to(currentPosition, 2000).easing(TWEEN.Easing.Quadratic.In)
         .onStart(function(){
 
         })
         .onComplete(function(){
-            TWEENS.runners.processId = TWEENS.runners.processId + 1;
-            if(TWEENS.runners.processId > dataList.length){
-                TWEENS.runners.processId = 1;
-            }
-            TWEENS.runners.runnersContainer[TWEENS.runners.processId].delay(1000).start();
+
         });
 
+        currentTween.chain(TWEENS.runners.originalPosition.delay(3000));
         TWEENS.runners.runnersContainer.push(currentTween);
     });  
 }