Bläddra i källkod

Remove unnecessay replayRepalcement code

David `Deltakosh` Catuhe 5 år sedan
förälder
incheckning
a7fd36a594

+ 1 - 2
inspector/src/components/actionTabs/lines/checkBoxLineComponent.tsx

@@ -9,7 +9,6 @@ export interface ICheckBoxLineComponentProps {
     isSelected?: () => boolean;
     onSelect?: (value: boolean) => void;
     onValueChanged?: () => void;
-    replaySourceReplacement?: string;
     onPropertyChangedObservable?: Observable<PropertyChangedEvent>;
 }
 
@@ -53,7 +52,7 @@ export class CheckBoxLineComponent extends React.Component<ICheckBoxLineComponen
         } else {
             if (this.props.onPropertyChangedObservable) {
                 this.props.onPropertyChangedObservable.notifyObservers({
-                    object: this.props.replaySourceReplacement ?? this.props.target,
+                    object: this.props.target,
                     property: this.props.propertyName!,
                     value: !this.state.isSelected,
                     initialValue: this.state.isSelected

+ 1 - 2
inspector/src/components/actionTabs/lines/floatLineComponent.tsx

@@ -13,7 +13,6 @@ interface IFloatLineComponentProps {
     lockObject?: LockObject;
     onChange?: (newValue: number) => void;
     isInteger?: boolean;
-    replaySourceReplacement?: string;
     onPropertyChangedObservable?: Observable<PropertyChangedEvent>;
     additionalClass?: string;
     step?: string,
@@ -63,7 +62,7 @@ export class FloatLineComponent extends React.Component<IFloatLineComponentProps
             return;
         }
         this.props.onPropertyChangedObservable.notifyObservers({
-            object: this.props.replaySourceReplacement ?? this.props.target,
+            object: this.props.target,
             property: this.props.propertyName,
             value: newValue,
             initialValue: previousValue

+ 1 - 2
inspector/src/components/actionTabs/lines/meshPickerComponent.tsx

@@ -13,7 +13,6 @@ interface IMeshPickerComponentProps {
     property: string,
     scene: Scene,
     label: string,
-    replaySourceReplacement?: string,
     onPropertyChangedObservable?: Observable<PropertyChangedEvent>
 }
 
@@ -56,7 +55,7 @@ export class MeshPickerComponent extends React.Component<IMeshPickerComponentPro
 
                             if (this.props.onPropertyChangedObservable) {                   
                                 this.props.onPropertyChangedObservable.notifyObservers({
-                                    object: this.props.replaySourceReplacement ?? this.props.target,
+                                    object: this.props.target,
                                     property: this.props.property,
                                     value: this.props.target[this.props.property],
                                     initialValue: currentState

+ 1 - 2
inspector/src/components/actionTabs/lines/sliderLineComponent.tsx

@@ -14,7 +14,6 @@ interface ISliderLineComponentProps {
     useEuler?: boolean;
     onChange?: (value: number) => void;
     onInput?: (value: number) => void;    
-    replaySourceReplacement?: string;
     onPropertyChangedObservable?: Observable<PropertyChangedEvent>;
     decimalCount?: number;
 }
@@ -68,7 +67,7 @@ export class SliderLineComponent extends React.Component<ISliderLineComponentPro
         if (this.props.target) {
             if (this.props.onPropertyChangedObservable) {
                 this.props.onPropertyChangedObservable.notifyObservers({
-                    object: this.props.replaySourceReplacement ?? this.props.target,
+                    object: this.props.target,
                     property: this.props.propertyName!,
                     value: newValue,
                     initialValue: this.state.value

+ 1 - 2
inspector/src/components/actionTabs/lines/vector3LineComponent.tsx

@@ -16,7 +16,6 @@ interface IVector3LineComponentProps {
     step?: number;
     onChange?: (newvalue: Vector3) => void;
     useEuler?: boolean,
-    replaySourceReplacement?: string,
     onPropertyChangedObservable?: Observable<PropertyChangedEvent>;
 }
 
@@ -63,7 +62,7 @@ export class Vector3LineComponent extends React.Component<IVector3LineComponentP
             return;
         }
         this.props.onPropertyChangedObservable.notifyObservers({
-            object: this.props.replaySourceReplacement ?? this.props.target,
+            object: this.props.target,
             property: this.props.propertyName,
             value: this.state.value,
             initialValue: previousValue

+ 4 - 5
inspector/src/components/actionTabs/tabs/propertyGrids/particleSystems/boxEmitterGridComponent.tsx

@@ -9,7 +9,6 @@ import { Vector3LineComponent } from '../../../lines/vector3LineComponent';
 interface IBoxEmitterGridComponentProps {
     globalState: GlobalState;
     emitter: BoxParticleEmitter,
-    replaySourceReplacement?: string,
     onPropertyChangedObservable?: Observable<PropertyChangedEvent>
 }
 
@@ -23,13 +22,13 @@ export class BoxEmitterGridComponent extends React.Component<IBoxEmitterGridComp
         let emitter = this.props.emitter;
         return (
             <>
-                <Vector3LineComponent replaySourceReplacement={this.props.replaySourceReplacement} label="Direction 1" target={emitter} propertyName="direction1"
+                <Vector3LineComponent label="Direction 1" target={emitter} propertyName="direction1"
                         onPropertyChangedObservable={this.props.onPropertyChangedObservable} />
-                <Vector3LineComponent replaySourceReplacement={this.props.replaySourceReplacement} label="Direction 2" target={emitter} propertyName="direction2"
+                <Vector3LineComponent label="Direction 2" target={emitter} propertyName="direction2"
                         onPropertyChangedObservable={this.props.onPropertyChangedObservable} />
-                <Vector3LineComponent replaySourceReplacement={this.props.replaySourceReplacement} label="Min emit box" target={emitter} propertyName="minEmitBox"
+                <Vector3LineComponent label="Min emit box" target={emitter} propertyName="minEmitBox"
                         onPropertyChangedObservable={this.props.onPropertyChangedObservable} />
-                <Vector3LineComponent replaySourceReplacement={this.props.replaySourceReplacement} label="Max emit box" target={emitter} propertyName="maxEmitBox"
+                <Vector3LineComponent label="Max emit box" target={emitter} propertyName="maxEmitBox"
                         onPropertyChangedObservable={this.props.onPropertyChangedObservable} />
             </>
         );

+ 4 - 5
inspector/src/components/actionTabs/tabs/propertyGrids/particleSystems/coneEmitterGridComponent.tsx

@@ -11,7 +11,6 @@ interface IConeEmitterGridComponentProps {
     globalState: GlobalState;
     emitter: ConeParticleEmitter,
     onSelectionChangedObservable?: Observable<any>,
-    replaySourceReplacement?: string,
     onPropertyChangedObservable?: Observable<PropertyChangedEvent>
 }
 
@@ -25,13 +24,13 @@ export class ConeEmitterGridComponent extends React.Component<IConeEmitterGridCo
         let emitter = this.props.emitter;
         return (
             <>
-                <SliderLineComponent replaySourceReplacement={this.props.replaySourceReplacement} label="Radius range" target={emitter} propertyName="radiusRange" minimum={0} maximum={1} step={0.01} 
+                <SliderLineComponent label="Radius range" target={emitter} propertyName="radiusRange" minimum={0} maximum={1} step={0.01} 
                     onPropertyChangedObservable={this.props.onPropertyChangedObservable} />
-                <SliderLineComponent replaySourceReplacement={this.props.replaySourceReplacement} label="Height range" target={emitter} propertyName="heightRange" minimum={0} maximum={1} step={0.01} 
+                <SliderLineComponent label="Height range" target={emitter} propertyName="heightRange" minimum={0} maximum={1} step={0.01} 
                     onPropertyChangedObservable={this.props.onPropertyChangedObservable} />
-                <CheckBoxLineComponent replaySourceReplacement={this.props.replaySourceReplacement} label="Emit from spawn point only" target={emitter} propertyName="emitFromSpawnPointOnly" 
+                <CheckBoxLineComponent label="Emit from spawn point only" target={emitter} propertyName="emitFromSpawnPointOnly" 
                     onPropertyChangedObservable={this.props.onPropertyChangedObservable} />                    
-                <SliderLineComponent replaySourceReplacement={this.props.replaySourceReplacement} label="Direction randomizer" target={emitter} propertyName="directionRandomizer" minimum={0} maximum={1} step={0.01} 
+                <SliderLineComponent label="Direction randomizer" target={emitter} propertyName="directionRandomizer" minimum={0} maximum={1} step={0.01} 
                     onPropertyChangedObservable={this.props.onPropertyChangedObservable} />
             </>
         );

+ 4 - 5
inspector/src/components/actionTabs/tabs/propertyGrids/particleSystems/cylinderEmitterGridComponent.tsx

@@ -12,7 +12,6 @@ interface ICylinderEmitterGridComponentProps {
     globalState: GlobalState;
     emitter: CylinderParticleEmitter,
     lockObject: LockObject,
-    replaySourceReplacement?: string,
     onPropertyChangedObservable?: Observable<PropertyChangedEvent>
 }
 
@@ -26,11 +25,11 @@ export class CylinderEmitterGridComponent extends React.Component<ICylinderEmitt
         let emitter = this.props.emitter;
         return (
             <>                    
-                <FloatLineComponent replaySourceReplacement={this.props.replaySourceReplacement} lockObject={this.props.lockObject} label="Radius" target={emitter} propertyName="radius" onPropertyChangedObservable={this.props.onPropertyChangedObservable} />
-                <FloatLineComponent replaySourceReplacement={this.props.replaySourceReplacement} lockObject={this.props.lockObject} label="Height" target={emitter} propertyName="height" onPropertyChangedObservable={this.props.onPropertyChangedObservable} />
-                <SliderLineComponent replaySourceReplacement={this.props.replaySourceReplacement} label="Radius range" target={emitter} propertyName="radiusRange" minimum={0} maximum={1} step={0.01} 
+                <FloatLineComponent lockObject={this.props.lockObject} label="Radius" target={emitter} propertyName="radius" onPropertyChangedObservable={this.props.onPropertyChangedObservable} />
+                <FloatLineComponent lockObject={this.props.lockObject} label="Height" target={emitter} propertyName="height" onPropertyChangedObservable={this.props.onPropertyChangedObservable} />
+                <SliderLineComponent label="Radius range" target={emitter} propertyName="radiusRange" minimum={0} maximum={1} step={0.01} 
                     onPropertyChangedObservable={this.props.onPropertyChangedObservable} />
-                <SliderLineComponent replaySourceReplacement={this.props.replaySourceReplacement} label="Direction randomizer" target={emitter} propertyName="directionRandomizer" minimum={0} maximum={1} step={0.01} 
+                <SliderLineComponent label="Direction randomizer" target={emitter} propertyName="directionRandomizer" minimum={0} maximum={1} step={0.01} 
                     onPropertyChangedObservable={this.props.onPropertyChangedObservable} />
             </>
         );

+ 3 - 4
inspector/src/components/actionTabs/tabs/propertyGrids/particleSystems/hemisphericEmitterGridComponent.tsx

@@ -12,7 +12,6 @@ interface IHemisphericEmitterGridComponentProps {
     globalState: GlobalState;
     emitter: HemisphericParticleEmitter,
     lockObject: LockObject,    
-    replaySourceReplacement?: string,
     onPropertyChangedObservable?: Observable<PropertyChangedEvent>
 }
 
@@ -26,10 +25,10 @@ export class HemisphericEmitterGridComponent extends React.Component<IHemispheri
         let emitter = this.props.emitter;
         return (
             <>                    
-                <FloatLineComponent replaySourceReplacement={this.props.replaySourceReplacement} lockObject={this.props.lockObject} label="Radius" target={emitter} propertyName="radius" onPropertyChangedObservable={this.props.onPropertyChangedObservable} />
-                <SliderLineComponent replaySourceReplacement={this.props.replaySourceReplacement} label="Radius range" target={emitter} propertyName="radiusRange" minimum={0} maximum={1} step={0.01} 
+                <FloatLineComponent lockObject={this.props.lockObject} label="Radius" target={emitter} propertyName="radius" onPropertyChangedObservable={this.props.onPropertyChangedObservable} />
+                <SliderLineComponent label="Radius range" target={emitter} propertyName="radiusRange" minimum={0} maximum={1} step={0.01} 
                     onPropertyChangedObservable={this.props.onPropertyChangedObservable} />
-                <SliderLineComponent replaySourceReplacement={this.props.replaySourceReplacement} label="Direction randomizer" target={emitter} propertyName="directionRandomizer" minimum={0} maximum={1} step={0.01} 
+                <SliderLineComponent label="Direction randomizer" target={emitter} propertyName="directionRandomizer" minimum={0} maximum={1} step={0.01} 
                     onPropertyChangedObservable={this.props.onPropertyChangedObservable} />
             </>
         );

+ 4 - 5
inspector/src/components/actionTabs/tabs/propertyGrids/particleSystems/meshEmitterGridComponent.tsx

@@ -16,7 +16,6 @@ interface IMeshEmitterGridComponentProps {
     scene: Scene,
     lockObject: LockObject,
     onSelectionChangedObservable?: Observable<any>,
-    replaySourceReplacement?: string,
     onPropertyChangedObservable?: Observable<PropertyChangedEvent>
 }
 
@@ -31,20 +30,20 @@ export class MeshEmitterGridComponent extends React.Component<IMeshEmitterGridCo
 
         return (
             <>        
-                <MeshPickerComponent replaySourceReplacement={this.props.replaySourceReplacement} globalState={this.props.globalState} label="Source" scene={this.props.scene} 
+                <MeshPickerComponent globalState={this.props.globalState} label="Source" scene={this.props.scene} 
                     onPropertyChangedObservable={this.props.onPropertyChangedObservable}
                     target={this.props.emitter} property="mesh"/>       
                 {
                     !emitter.useMeshNormalsForDirection &&
-                    <Vector3LineComponent replaySourceReplacement={this.props.replaySourceReplacement} label="Direction 1" target={emitter} propertyName="direction1"
+                    <Vector3LineComponent label="Direction 1" target={emitter} propertyName="direction1"
                         onPropertyChangedObservable={this.props.onPropertyChangedObservable} />
                 }
                 {
                     !emitter.useMeshNormalsForDirection &&
-                    <Vector3LineComponent replaySourceReplacement={this.props.replaySourceReplacement} label="Direction 2" target={emitter} propertyName="direction2"
+                    <Vector3LineComponent label="Direction 2" target={emitter} propertyName="direction2"
                         onPropertyChangedObservable={this.props.onPropertyChangedObservable} />      
                 }
-                <CheckBoxLineComponent replaySourceReplacement={this.props.replaySourceReplacement} label="Use normals for direction" target={emitter} propertyName="useMeshNormalsForDirection" 
+                <CheckBoxLineComponent label="Use normals for direction" target={emitter} propertyName="useMeshNormalsForDirection" 
                     onPropertyChangedObservable={this.props.onPropertyChangedObservable} />                                    
             </>
         );

+ 7 - 8
inspector/src/components/actionTabs/tabs/propertyGrids/particleSystems/particleSystemPropertyGridComponent.tsx

@@ -59,41 +59,40 @@ export class ParticleSystemPropertyGridComponent extends React.Component<IPartic
 
     renderEmitter() {
         const system = this.props.system;
-        const replaySource = "particlesystem.particleEmitterType";
         switch(system.particleEmitterType?.getClassName()) {
             case "BoxParticleEmitter":
                 return (
-                    <BoxEmitterGridComponent replaySourceReplacement={replaySource}
+                    <BoxEmitterGridComponent 
                         globalState={this.props.globalState} emitter={system.particleEmitterType as BoxParticleEmitter} onPropertyChangedObservable={this.props.onPropertyChangedObservable}/>
                 );
             case "ConeParticleEmitter":
                 return (
-                    <ConeEmitterGridComponent replaySourceReplacement={replaySource}
+                    <ConeEmitterGridComponent 
                         globalState={this.props.globalState} emitter={system.particleEmitterType as ConeParticleEmitter} onPropertyChangedObservable={this.props.onPropertyChangedObservable}/>
                 );
             case "CylinderParticleEmitter":
                 return (
-                    <CylinderEmitterGridComponent replaySourceReplacement={replaySource}
+                    <CylinderEmitterGridComponent 
                         lockObject={this.props.lockObject} globalState={this.props.globalState} emitter={system.particleEmitterType as CylinderParticleEmitter} onPropertyChangedObservable={this.props.onPropertyChangedObservable}/>
                 );        
             case "HemisphericParticleEmitter":
                 return (
-                    <HemisphericEmitterGridComponent replaySourceReplacement={replaySource}
+                    <HemisphericEmitterGridComponent 
                         lockObject={this.props.lockObject} globalState={this.props.globalState} emitter={system.particleEmitterType as HemisphericParticleEmitter} onPropertyChangedObservable={this.props.onPropertyChangedObservable}/>
                 );  
             case "MeshParticleEmitter":
                 return (
-                    <MeshEmitterGridComponent replaySourceReplacement={replaySource} 
+                    <MeshEmitterGridComponent  
                     lockObject={this.props.lockObject} scene={system.getScene()} globalState={this.props.globalState} emitter={system.particleEmitterType as MeshParticleEmitter} onPropertyChangedObservable={this.props.onPropertyChangedObservable}/>
                 );                 
             case "PointParticleEmitter":
                 return (
-                    <PointEmitterGridComponent replaySourceReplacement={replaySource}
+                    <PointEmitterGridComponent 
                         lockObject={this.props.lockObject} globalState={this.props.globalState} emitter={system.particleEmitterType as PointParticleEmitter} onPropertyChangedObservable={this.props.onPropertyChangedObservable}/>
                 );  
             case "SphereParticleEmitter":
                 return (
-                    <SphereEmitterGridComponent replaySourceReplacement={replaySource}
+                    <SphereEmitterGridComponent 
                         lockObject={this.props.lockObject} globalState={this.props.globalState} emitter={system.particleEmitterType as SphereParticleEmitter} onPropertyChangedObservable={this.props.onPropertyChangedObservable}/>
                 );                                                                                                       
         }

+ 2 - 3
inspector/src/components/actionTabs/tabs/propertyGrids/particleSystems/pointEmitterGridComponent.tsx

@@ -11,7 +11,6 @@ interface IPointEmitterGridComponentProps {
     globalState: GlobalState;
     emitter: PointParticleEmitter,
     lockObject: LockObject,
-    replaySourceReplacement?: string,
     onPropertyChangedObservable?: Observable<PropertyChangedEvent>
 }
 
@@ -25,9 +24,9 @@ export class PointEmitterGridComponent extends React.Component<IPointEmitterGrid
         let emitter = this.props.emitter;
         return (
             <>                   
-                <Vector3LineComponent replaySourceReplacement={this.props.replaySourceReplacement} label="Direction 1" target={emitter} propertyName="direction1"
+                <Vector3LineComponent  label="Direction 1" target={emitter} propertyName="direction1"
                     onPropertyChangedObservable={this.props.onPropertyChangedObservable} />
-                <Vector3LineComponent replaySourceReplacement={this.props.replaySourceReplacement} label="Direction 2" target={emitter} propertyName="direction2"
+                <Vector3LineComponent  label="Direction 2" target={emitter} propertyName="direction2"
                     onPropertyChangedObservable={this.props.onPropertyChangedObservable} />                 
             </>
         );

+ 3 - 4
inspector/src/components/actionTabs/tabs/propertyGrids/particleSystems/sphereEmitterGridComponent.tsx

@@ -12,7 +12,6 @@ interface ISphereEmitterGridComponentProps {
     globalState: GlobalState;
     emitter: SphereParticleEmitter,
     lockObject: LockObject,
-    replaySourceReplacement?: string,
     onPropertyChangedObservable?: Observable<PropertyChangedEvent>
 }
 
@@ -26,10 +25,10 @@ export class SphereEmitterGridComponent extends React.Component<ISphereEmitterGr
         let emitter = this.props.emitter;
         return (
             <>                   
-                <FloatLineComponent replaySourceReplacement={this.props.replaySourceReplacement} lockObject={this.props.lockObject} label="Radius" target={emitter} propertyName="radius" onPropertyChangedObservable={this.props.onPropertyChangedObservable} />
-                <SliderLineComponent replaySourceReplacement={this.props.replaySourceReplacement} label="Radius range" target={emitter} propertyName="radiusRange" minimum={0} maximum={1} step={0.01} 
+                <FloatLineComponent lockObject={this.props.lockObject} label="Radius" target={emitter} propertyName="radius" onPropertyChangedObservable={this.props.onPropertyChangedObservable} />
+                <SliderLineComponent label="Radius range" target={emitter} propertyName="radiusRange" minimum={0} maximum={1} step={0.01} 
                     onPropertyChangedObservable={this.props.onPropertyChangedObservable} />
-                <SliderLineComponent replaySourceReplacement={this.props.replaySourceReplacement} label="Direction randomizer" target={emitter} propertyName="directionRandomizer" minimum={0} maximum={1} step={0.01} 
+                <SliderLineComponent label="Direction randomizer" target={emitter} propertyName="directionRandomizer" minimum={0} maximum={1} step={0.01} 
                     onPropertyChangedObservable={this.props.onPropertyChangedObservable} />               
             </>
         );