Bladeren bron

Merge branch 'v1.2.0-ga' of http://192.168.0.115:3000/bill/fuse-code into v1.2.0-ga

bill 4 maanden geleden
bovenliggende
commit
40690eadb0
2 gewijzigde bestanden met toevoegingen van 6 en 2 verwijderingen
  1. 5 1
      public/lib/potree/potree.js
  2. 1 1
      public/lib/potree/potree.js.map

+ 5 - 1
public/lib/potree/potree.js

@@ -82337,7 +82337,11 @@
 	        var endTime2 = key.time + key.dur - fadeTimeEnd;
 	        key.tempTime_ = time - startTime1; //当前动作时间 
 
-	        if (i == _keys2.length - 1 && time > endTime2) {
+	        if (i == 0 && time < key.time) {
+	          //开始前维持第一个动作
+	          key.tempTime_ = 0;
+	          return 1;
+	        } else if (i == _keys2.length - 1 && time > endTime2) {
 	          //所有动作播完后维持最后一个动作
 	          key.tempTime_ = Math.min(key.tempTime_, key.dur);
 	          return 1;

File diff suppressed because it is too large
+ 1 - 1
public/lib/potree/potree.js.map