Pārlūkot izejas kodu

Ensure correct 0,1,2 order in the RigidBody2D body type enum for serialization. Closes #837.

Lasse Öörni 10 gadi atpakaļ
vecāks
revīzija
9e331d04d4

+ 1 - 1
Source/Urho3D/LuaScript/pkgs/Urho2D/RigidBody2D.pkg

@@ -3,8 +3,8 @@ $#include "Urho2D/RigidBody2D.h"
 enum BodyType2D
 {
     BT_STATIC = b2_staticBody,
-    BT_DYNAMIC = b2_dynamicBody,
     BT_KINEMATIC = b2_kinematicBody,
+    BT_DYNAMIC = b2_dynamicBody
 };
 
 class RigidBody2D : Component

+ 1 - 1
Source/Urho3D/Script/Urho2DAPI.cpp

@@ -298,8 +298,8 @@ static void RegisterRigidBody2D(asIScriptEngine* engine)
 {
     engine->RegisterEnum("BodyType2D");
     engine->RegisterEnumValue("BodyType2D", "BT_STATIC", BT_STATIC);
-    engine->RegisterEnumValue("BodyType2D", "BT_DYNAMIC", BT_DYNAMIC);
     engine->RegisterEnumValue("BodyType2D", "BT_KINEMATIC", BT_KINEMATIC);
+    engine->RegisterEnumValue("BodyType2D", "BT_DYNAMIC", BT_DYNAMIC);
 
     RegisterComponent<RigidBody2D>(engine, "RigidBody2D");
     engine->RegisterObjectMethod("RigidBody2D", "void set_bodyType(BodyType2D)", asMETHOD(RigidBody2D, SetBodyType), asCALL_THISCALL);

+ 1 - 1
Source/Urho3D/Urho2D/RigidBody2D.cpp

@@ -42,8 +42,8 @@ static const BodyType2D DEFAULT_BODYTYPE = BT_STATIC;
 static const char* bodyTypeNames[] =
 {
     "Static",
-    "Dynamic",
     "Kinematic",
+    "Dynamic",
     0
 };
 

+ 1 - 1
Source/Urho3D/Urho2D/RigidBody2D.h

@@ -37,8 +37,8 @@ class PhysicsWorld2D;
 enum BodyType2D
 {
     BT_STATIC = b2_staticBody,
-    BT_DYNAMIC = b2_dynamicBody,
     BT_KINEMATIC = b2_kinematicBody,
+    BT_DYNAMIC = b2_dynamicBody
 };
 
 /// 2D rigid body component.