archive-gh-me/ShadowEditor
1
0
Fork 0
mirror of https://github.com/tengge1/ShadowEditor.git synced 2026-01-25 15:08:11 +00:00
Code Issues Projects Releases Wiki Activity

完善烟组件。

Browse Source
This commit is contained in:
tengge1 2019-03-17 16:40:06 +08:00
parent 612fb7b8cb
commit 0f7f1aadcf
2 changed files with 59 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
ShadowEditor.Web/src/component/SmokeComponent.js
View File

@ -34,6 +34,44 @@ SmokeComponent.prototype.render = function () {
fontWeight: 'bold'
},
text: L_SMOKE_COMPONENT
},
// {
// xtype: 'row',
// children: [{
// xtype: 'label',
// text: '数量'
// }, {
// xtype: 'int',
// id: 'particleCount',
// scope: this.id,
// range: [0, Infinity],
// onChange: this.onChange.bind(this)
// }]
// },
{
xtype: 'row',
children: [{
xtype: 'label',
text: '尺寸'
}, {
xtype: 'int',
id: 'size',
scope: this.id,
range: [0, Infinity],
onChange: this.onChange.bind(this)
}]
}, {
xtype: 'row',
children: [{
xtype: 'label',
text: '时长'
}, {
xtype: 'int',
id: 'lifetime',
scope: this.id,
range: [0, Infinity],
onChange: this.onChange.bind(this)
}]
}, {
xtype: 'row',
children: [{
@ -75,8 +113,15 @@ SmokeComponent.prototype.updateUI = function () {
this.selected = editor.selected;
// var particleCount = UI.get('particleCount', this.id);
var size = UI.get('size', this.id);
var lifetime = UI.get('lifetime', this.id);
var btnPreview = UI.get('btnPreview', this.id);
// particleCount.setValue(this.selected.userData.particleCount);
size.setValue(this.selected.userData.size);
lifetime.setValue(this.selected.userData.lifetime);
if (this.isPlaying) {
btnPreview.setText(L_CANCEL);
} else {
@ -84,6 +129,19 @@ SmokeComponent.prototype.updateUI = function () {
}
};
SmokeComponent.prototype.onChange = function () {
// var particleCount = UI.get('particleCount', this.id);
var size = UI.get('size', this.id);
var lifetime = UI.get('lifetime', this.id);
// this.selected.userData.particleCount = particleCount.getValue();
this.selected.userData.size = size.getValue();
this.selected.userData.lifetime = lifetime.getValue();
this.selected.material.uniforms.size.value = size.getValue();
this.selected.material.uniforms.lifetime.value = lifetime.getValue();
};
SmokeComponent.prototype.onPreview = function () {
if (this.isPlaying) {
this.stopPreview();

2
ShadowEditor.Web/src/serialization/objects/SmokeSerializer.js
View File

@ -20,7 +20,7 @@ SmokeSerializer.prototype.toJSON = function (obj) {
};
SmokeSerializer.prototype.fromJSON = function (json, parent, camera, renderer) {
var obj = parent || new Smoke(camera, renderer);
var obj = parent || new Smoke(camera, renderer, json.userData);
MeshSerializer.prototype.fromJSON.call(this, json, obj);