David Catuhe 5 năm trước cách đây
mục cha
commit
de8f948e8f

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 1
dist/preview release/babylon.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 77 - 33
dist/preview release/babylon.max.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 1
dist/preview release/babylon.max.js.map


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 1
dist/preview release/inspector/babylon.inspector.bundle.js


+ 20 - 1
dist/preview release/inspector/babylon.inspector.bundle.max.js

@@ -56314,7 +56314,17 @@ var ColorPickerLineComponent = /** @class */ (function (_super) {
         div.style.left = host.getBoundingClientRect().left - div.getBoundingClientRect().width + "px";
     };
     ColorPickerLineComponent.prototype.shouldComponentUpdate = function (nextProps, nextState) {
-        return nextProps.value.toHexString() !== this.props.value.toHexString()
+        var diffProps = nextProps.value.toHexString() !== this.props.value.toHexString();
+        if (diffProps) {
+            nextState.color = {
+                r: nextProps.value.r * 255,
+                g: nextProps.value.g * 255,
+                b: nextProps.value.b * 255,
+                a: nextProps instanceof babylonjs_Maths_math_color__WEBPACK_IMPORTED_MODULE_2__["Color4"] ? nextProps.a * 100 : 100,
+            };
+            nextState.hex = nextProps.value.toHexString();
+        }
+        return diffProps
             || nextProps.disableAlpha !== this.props.disableAlpha
             || nextState.hex !== this.state.hex
             || nextState.pickerEnabled !== this.state.pickerEnabled;
@@ -62456,6 +62466,15 @@ var FactorGradientStepGridComponent = /** @class */ (function (_super) {
         _this.state = { gradient: props.gradient.gradient, factor1: _this.props.gradient.factor1.toString(), factor2: (_a = _this.props.gradient.factor2) === null || _a === void 0 ? void 0 : _a.toString() };
         return _this;
     }
+    FactorGradientStepGridComponent.prototype.shouldComponentUpdate = function (nextProps, nextState) {
+        var _a;
+        if (nextProps.gradient !== this.props.gradient) {
+            nextState.gradient = nextProps.gradient.gradient;
+            nextState.factor1 = nextProps.gradient.factor1.toString();
+            nextState.factor2 = (_a = nextProps.gradient.factor2) === null || _a === void 0 ? void 0 : _a.toString();
+        }
+        return true;
+    };
     FactorGradientStepGridComponent.prototype.updateFactor1 = function (valueString) {
         if (/[^0-9\.\-]/g.test(valueString)) {
             return;

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 1
dist/preview release/inspector/babylon.inspector.bundle.max.js.map


+ 5 - 0
dist/preview release/inspector/babylon.inspector.d.ts

@@ -1528,6 +1528,11 @@ declare module INSPECTOR {
         factor2?: string;
     }> {
         constructor(props: IFactorGradientStepGridComponent);
+        shouldComponentUpdate(nextProps: IFactorGradientStepGridComponent, nextState: {
+            gradient: number;
+            factor1: string;
+            factor2?: string;
+        }): boolean;
         updateFactor1(valueString: string): void;
         updateFactor2(valueString: string): void;
         updateGradient(gradient: number): void;

+ 10 - 0
dist/preview release/inspector/babylon.inspector.module.d.ts

@@ -1983,6 +1983,11 @@ declare module "babylonjs-inspector/components/actionTabs/tabs/propertyGrids/par
         factor2?: string;
     }> {
         constructor(props: IFactorGradientStepGridComponent);
+        shouldComponentUpdate(nextProps: IFactorGradientStepGridComponent, nextState: {
+            gradient: number;
+            factor1: string;
+            factor2?: string;
+        }): boolean;
         updateFactor1(valueString: string): void;
         updateFactor2(valueString: string): void;
         updateGradient(gradient: number): void;
@@ -4290,6 +4295,11 @@ declare module INSPECTOR {
         factor2?: string;
     }> {
         constructor(props: IFactorGradientStepGridComponent);
+        shouldComponentUpdate(nextProps: IFactorGradientStepGridComponent, nextState: {
+            gradient: number;
+            factor1: string;
+            factor2?: string;
+        }): boolean;
         updateFactor1(valueString: string): void;
         updateFactor2(valueString: string): void;
         updateGradient(gradient: number): void;

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 6 - 6
dist/preview release/viewer/babylon.viewer.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 1
dist/preview release/viewer/babylon.viewer.max.js


+ 22 - 0
src/Particles/particleSystem.ts

@@ -2207,6 +2207,8 @@ export class ParticleSystem extends BaseParticleSystem implements IDisposable, I
 
                 if (colorGradient.color2) {
                     serializedGradient.color2 = colorGradient.color2.asArray();
+                } else {
+                    serializedGradient.color2 = colorGradient.color1.asArray();
                 }
 
                 serializationObject.colorGradients.push(serializedGradient);
@@ -2239,6 +2241,8 @@ export class ParticleSystem extends BaseParticleSystem implements IDisposable, I
 
                 if (colorRemapGradient.factor2 !== undefined) {
                     serializedGradient.factor2 = colorRemapGradient.factor2;
+                } else {
+                    serializedGradient.factor2 = colorRemapGradient.factor1;
                 }
 
                 serializationObject.colorRemapGradients.push(serializedGradient);
@@ -2257,6 +2261,8 @@ export class ParticleSystem extends BaseParticleSystem implements IDisposable, I
 
                 if (alphaRemapGradient.factor2 !== undefined) {
                     serializedGradient.factor2 = alphaRemapGradient.factor2;
+                } else {
+                    serializedGradient.factor2 = alphaRemapGradient.factor1;
                 }
 
                 serializationObject.alphaRemapGradients.push(serializedGradient);
@@ -2275,6 +2281,8 @@ export class ParticleSystem extends BaseParticleSystem implements IDisposable, I
 
                 if (sizeGradient.factor2 !== undefined) {
                     serializedGradient.factor2 = sizeGradient.factor2;
+                } else {
+                    serializedGradient.factor2 = sizeGradient.factor1;
                 }
 
                 serializationObject.sizeGradients.push(serializedGradient);
@@ -2293,6 +2301,8 @@ export class ParticleSystem extends BaseParticleSystem implements IDisposable, I
 
                 if (angularSpeedGradient.factor2 !== undefined) {
                     serializedGradient.factor2 = angularSpeedGradient.factor2;
+                } else {
+                    serializedGradient.factor2 = angularSpeedGradient.factor1;
                 }
 
                 serializationObject.angularSpeedGradients.push(serializedGradient);
@@ -2311,6 +2321,8 @@ export class ParticleSystem extends BaseParticleSystem implements IDisposable, I
 
                 if (velocityGradient.factor2 !== undefined) {
                     serializedGradient.factor2 = velocityGradient.factor2;
+                } else {
+                    serializedGradient.factor2 = velocityGradient.factor1;
                 }
 
                 serializationObject.velocityGradients.push(serializedGradient);
@@ -2329,6 +2341,8 @@ export class ParticleSystem extends BaseParticleSystem implements IDisposable, I
 
                 if (dragGradient.factor2 !== undefined) {
                     serializedGradient.factor2 = dragGradient.factor2;
+                } else {
+                    serializedGradient.factor2 = dragGradient.factor1;
                 }
 
                 serializationObject.dragGradients.push(serializedGradient);
@@ -2347,6 +2361,8 @@ export class ParticleSystem extends BaseParticleSystem implements IDisposable, I
 
                 if (emitRateGradient.factor2 !== undefined) {
                     serializedGradient.factor2 = emitRateGradient.factor2;
+                } else {
+                    serializedGradient.factor2 = emitRateGradient.factor1;
                 }
 
                 serializationObject.emitRateGradients.push(serializedGradient);
@@ -2365,6 +2381,8 @@ export class ParticleSystem extends BaseParticleSystem implements IDisposable, I
 
                 if (startSizeGradient.factor2 !== undefined) {
                     serializedGradient.factor2 = startSizeGradient.factor2;
+                } else {
+                    serializedGradient.factor2 = startSizeGradient.factor1;
                 }
 
                 serializationObject.startSizeGradients.push(serializedGradient);
@@ -2383,6 +2401,8 @@ export class ParticleSystem extends BaseParticleSystem implements IDisposable, I
 
                 if (lifeTimeGradient.factor2 !== undefined) {
                     serializedGradient.factor2 = lifeTimeGradient.factor2;
+                } else {
+                    serializedGradient.factor2 = lifeTimeGradient.factor1;
                 }
 
                 serializationObject.lifeTimeGradients.push(serializedGradient);
@@ -2401,6 +2421,8 @@ export class ParticleSystem extends BaseParticleSystem implements IDisposable, I
 
                 if (limitVelocityGradient.factor2 !== undefined) {
                     serializedGradient.factor2 = limitVelocityGradient.factor2;
+                } else {
+                    serializedGradient.factor2 = limitVelocityGradient.factor1;
                 }
 
                 serializationObject.limitVelocityGradients.push(serializedGradient);