浏览代码

Merge branch 'master' of https://github.com/BabylonJS/Babylon.js

# Conflicts:
#	dist/preview release/inspector/babylon.inspector.bundle.js.map
Jaskar 7 年之前
父节点
当前提交
ba03e488b0

文件差异内容过多而无法显示
+ 8714 - 8714
Playground/babylon.d.txt


文件差异内容过多而无法显示
+ 756 - 756
dist/preview release/babylon.d.ts


文件差异内容过多而无法显示
+ 1 - 1
dist/preview release/babylon.js


文件差异内容过多而无法显示
+ 1 - 1
dist/preview release/babylon.max.js


文件差异内容过多而无法显示
+ 1 - 1
dist/preview release/babylon.no-module.max.js


文件差异内容过多而无法显示
+ 1 - 1
dist/preview release/babylon.worker.js


文件差异内容过多而无法显示
+ 1 - 1
dist/preview release/es6.js


文件差异内容过多而无法显示
+ 1 - 1
dist/preview release/gui/babylon.gui.min.js.map


文件差异内容过多而无法显示
+ 1 - 1
dist/preview release/inspector/babylon.inspector.bundle.js.map


文件差异内容过多而无法显示
+ 1 - 1
dist/preview release/viewer/babylon.viewer.js


文件差异内容过多而无法显示
+ 3 - 3
dist/preview release/viewer/babylon.viewer.max.js


+ 5 - 4
src/Shaders/gpuUpdateParticles.vertex.fx

@@ -130,7 +130,8 @@ vec4 getRandomVec4(float offset) {
 }
 
 void main() {
-  if (age >= life) {
+  float newAge = age + timeDelta;
+  if (newAge >= life) {
     if (stopFactor == 0.) {
       outPosition = position;
       outAge = life;
@@ -284,14 +285,14 @@ void main() {
 
   } else {   
     float directionScale = timeDelta;
-    float ageGradient = age / life;
+    outAge = newAge;
+    float ageGradient = newAge / life;
 
 #ifdef VELOCITYGRADIENTS
     directionScale *= texture(velocityGradientSampler, vec2(ageGradient, 0)).r;
 #endif
-
     outPosition = position + direction * directionScale;
-    outAge = age + timeDelta;
+    
     outLife = life;
     outSeed = seed;
 #ifndef COLORGRADIENTS