Browse Source

Match the enum order in EmitterType edit field.

Lasse Öörni 10 years ago
parent
commit
25ed4020a0

+ 1 - 1
Source/Urho3D/Graphics/ParticleEffect.h

@@ -31,7 +31,7 @@ namespace Urho3D
 /// Particle emitter shapes.
 /// Particle emitter shapes.
 enum EmitterType
 enum EmitterType
 {
 {
-    EMITTER_SPHERE,
+    EMITTER_SPHERE = 0,
     EMITTER_BOX
     EMITTER_BOX
 };
 };
 
 

+ 4 - 4
bin/Data/Scripts/Editor/EditorParticleEffect.as

@@ -686,11 +686,11 @@ void EditParticleEffectEmitterShape(StringHash eventType, VariantMap& eventData)
     switch (element.selection)
     switch (element.selection)
     {
     {
         case 0:
         case 0:
-            editParticleEffect.emitterType = EMITTER_BOX;
+            editParticleEffect.emitterType = EMITTER_SPHERE;
             break;
             break;
 
 
         case 1:
         case 1:
-            editParticleEffect.emitterType = EMITTER_SPHERE;
+            editParticleEffect.emitterType = EMITTER_BOX;
             break;
             break;
     }
     }
 
 
@@ -1447,10 +1447,10 @@ void RefreshParticleEffectBasicAttributes()
 
 
     switch (editParticleEffect.emitterType)
     switch (editParticleEffect.emitterType)
     {
     {
-        case EMITTER_BOX:
+        case EMITTER_SPHERE:
             cast<DropDownList>(particleEffectWindow.GetChild("EmitterShape", true)).selection = 0;
             cast<DropDownList>(particleEffectWindow.GetChild("EmitterShape", true)).selection = 0;
             break;
             break;
-        case EMITTER_SPHERE:
+        case EMITTER_BOX:
             cast<DropDownList>(particleEffectWindow.GetChild("EmitterShape", true)).selection = 1;
             cast<DropDownList>(particleEffectWindow.GetChild("EmitterShape", true)).selection = 1;
             break;
             break;
     }
     }

+ 2 - 2
bin/Data/UI/EditorParticleEffectWindow.xml

@@ -618,10 +618,10 @@
                                         <element type="BorderImage" internal="true" style="none">
                                         <element type="BorderImage" internal="true" style="none">
                                             <element internal="true" style="none">
                                             <element internal="true" style="none">
                                                 <element type="Text" style="FileSelectorFilterText">
                                                 <element type="Text" style="FileSelectorFilterText">
-                                                    <attribute name="Text" value="Box" />
+                                                    <attribute name="Text" value="Sphere" />
                                                 </element>
                                                 </element>
                                                 <element type="Text" style="FileSelectorFilterText">
                                                 <element type="Text" style="FileSelectorFilterText">
-                                                    <attribute name="Text" value="Sphere" />
+                                                    <attribute name="Text" value="Box" />
                                                 </element>
                                                 </element>
                                             </element>
                                             </element>
                                         </element>
                                         </element>