particle frames now supports ParticleEmitterFrameConfig

koreezgames · Oct 12, 2018 · 5dee03d · 5dee03d
1 parent a992826
commit 5dee03d
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 6 deletions.
diff --git a/src/components/EmitterConfig/expansionPanelFrame.tsx b/src/components/EmitterConfig/expansionPanelFrame.tsx
@@ -7,11 +7,21 @@ import {
   Grid,
 } from '@material-ui/core';
 import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
-import Select from '../Select';
-import { blendModes, frames } from '../../constants';
+import { inject, observer } from 'mobx-react';
+import { EMITTER_STORE, EmitterStoreProp } from 'src/stores';
+import Switch from '../Switch';
+import TextField from '../TextField';
+import MultipleInput from '../MultipleInput';
+import { selectComponent } from '../Select';
+import { frames } from 'src/constants';
+import _get from 'lodash/get';
 
-class ExpansionPanelFrame extends Component {
+@inject(EMITTER_STORE)
+@observer
+class ExpansionPanelFrame extends Component<EmitterStoreProp> {
   render() {
+    const { emitterStore } = this.props;
+    const { currentEmitterConfig } = emitterStore!;
     return (
       <ExpansionPanel>
         <ExpansionPanelSummary expandIcon={<ExpandMoreIcon />}>
@@ -20,10 +30,31 @@ class ExpansionPanelFrame extends Component {
         <ExpansionPanelDetails>
           <Grid container spacing={16}>
             <Grid item xs={6}>
-              <Select configName="blendMode" options={blendModes} />
+              <Switch
+                configName="frame>cycle"
+                label="Cycle"
+                disabled={currentEmitterConfig.frame.frames.length < 2}
+              />
             </Grid>
             <Grid item xs={6}>
-              <Select configName="frame" options={frames} />
+              <TextField
+                configName="frame>quantity"
+                type="number"
+                label="Quantity"
+                disabled={!currentEmitterConfig.frame.cycle}
+              />
+            </Grid>
+            <Grid item xs={12}>
+              <MultipleInput configName="frame>frames">
+                {(params: any) => {
+                  const { configName } = params;
+                  return selectComponent({
+                    ...params,
+                    options: frames,
+                    value: _get(currentEmitterConfig, configName.split('>')),
+                  });
+                }}
+              </MultipleInput>
             </Grid>
           </Grid>
         </ExpansionPanelDetails>

diff --git a/src/components/Select/index.tsx b/src/components/Select/index.tsx
@@ -45,4 +45,10 @@ class Select extends Component<Props & EmitterStoreProp> {
   }
 }
 
+const selectComponent = (params: any) => {
+  return <Select {...params} />;
+};
+
+export { selectComponent };
+
 export default Select;
diff --git a/src/constants/emitterConfig.ts b/src/constants/emitterConfig.ts
@@ -10,7 +10,7 @@ const emitterConfig = {
   on: true,
   particleBringToTop: true,
   radial: true,
-  frame: frames[0].value,
+  frame: { frames: [frames[0].value], cycle: false, quantity: 1 },
   frequency: 0,
   gravityX: 0,
   gravityY: 0,