|
@@ -603,8 +603,8 @@ bool ShowParticleEffectEditor()
|
|
|
void HideParticleEffectEditor()
|
|
void HideParticleEffectEditor()
|
|
|
{
|
|
{
|
|
|
log.Info("HideParticleEffectEditor()");
|
|
log.Info("HideParticleEffectEditor()");
|
|
|
- //if (particleEffectWindow !is null)
|
|
|
|
|
- //particleEffectWindow.visible = false;
|
|
|
|
|
|
|
+ if (particleEffectWindow !is null)
|
|
|
|
|
+ particleEffectWindow.visible = false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
void InitParticleEffectPreview()
|
|
void InitParticleEffectPreview()
|
|
@@ -643,7 +643,7 @@ void InitParticleEffectPreview()
|
|
|
gizmo.occludee = false;
|
|
gizmo.occludee = false;
|
|
|
|
|
|
|
|
particleEffectEmitter = particleEffectPreviewNode.CreateComponent("ParticleEmitter");
|
|
particleEffectEmitter = particleEffectPreviewNode.CreateComponent("ParticleEmitter");
|
|
|
- editParticleEffect = ParticleEffect();//cache.GetResource("ParticleEffect", "Particle/SnowExplosion.xml");
|
|
|
|
|
|
|
+ editParticleEffect = CreateNewParticleEffect();//cache.GetResource("ParticleEffect", "Particle/SnowExplosion.xml");
|
|
|
particleEffectEmitter.effect = editParticleEffect;
|
|
particleEffectEmitter.effect = editParticleEffect;
|
|
|
|
|
|
|
|
SubscribeToEvent(particleEffectPreviewNode, "Update", "HandleParticleEffectUpdate");
|
|
SubscribeToEvent(particleEffectPreviewNode, "Update", "HandleParticleEffectUpdate");
|
|
@@ -655,6 +655,17 @@ void InitParticleEffectPreview()
|
|
|
SubscribeToEvent(particleEffectPreview, "DragMove", "RotateParticleEffectPreview");
|
|
SubscribeToEvent(particleEffectPreview, "DragMove", "RotateParticleEffectPreview");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ParticleEffect@ CreateNewParticleEffect()
|
|
|
|
|
+{
|
|
|
|
|
+ ParticleEffect@ effect = ParticleEffect();
|
|
|
|
|
+ Material@ res = cache.GetResource("Material", "Materials/Particle.xml");
|
|
|
|
|
+ if (res is null)
|
|
|
|
|
+ log.Error("Could not load default material for new particle effect.");
|
|
|
|
|
+ effect.material = res;
|
|
|
|
|
+ effect.AddColorTime(Color(1,1,1,1), 0.0f);
|
|
|
|
|
+ return effect;
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
void HandleParticleEffectUpdate(StringHash eventType, VariantMap& eventData)
|
|
void HandleParticleEffectUpdate(StringHash eventType, VariantMap& eventData)
|
|
|
{
|
|
{
|
|
|
log.Info("ASDSA");
|
|
log.Info("ASDSA");
|
|
@@ -1111,9 +1122,7 @@ void RefreshParticleEffectMaterial()
|
|
|
{
|
|
{
|
|
|
nameEdit.text = "Materials/Particle.xml";
|
|
nameEdit.text = "Materials/Particle.xml";
|
|
|
Material@ res = cache.GetResource("Material", "Materials/Particle.xml");
|
|
Material@ res = cache.GetResource("Material", "Materials/Particle.xml");
|
|
|
- if (res is null)
|
|
|
|
|
- log.Error("Could not load default material for particle effect editor.");
|
|
|
|
|
- else
|
|
|
|
|
|
|
+ if (res !is null)
|
|
|
editParticleEffect.material = res;
|
|
editParticleEffect.material = res;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -1191,7 +1200,7 @@ void PickEditParticleEffectDone(StringHash eventType, VariantMap& eventData)
|
|
|
void NewParticleEffect()
|
|
void NewParticleEffect()
|
|
|
{
|
|
{
|
|
|
log.Info("NewParticleEffect()");
|
|
log.Info("NewParticleEffect()");
|
|
|
- EditParticleEffect(ParticleEffect());
|
|
|
|
|
|
|
+ EditParticleEffect(CreateNewParticleEffect());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
void RevertParticleEffect()
|
|
void RevertParticleEffect()
|