Ver código fonte

Update face camera mode name and add script bindings.

Eugene Kozlov 9 anos atrás
pai
commit
02fae13ad6

+ 1 - 0
Source/Urho3D/AngelScript/GraphicsAPI.cpp

@@ -1448,6 +1448,7 @@ static void RegisterBillboardSet(asIScriptEngine* engine)
     engine->RegisterEnumValue("FaceCameraMode", "FC_ROTATE_Y", FC_ROTATE_Y);
     engine->RegisterEnumValue("FaceCameraMode", "FC_LOOKAT_XYZ", FC_LOOKAT_XYZ);
     engine->RegisterEnumValue("FaceCameraMode", "FC_LOOKAT_Y", FC_LOOKAT_Y);
+    engine->RegisterEnumValue("FaceCameraMode", "FC_LOOKAT_MIXED", FC_LOOKAT_MIXED);
     engine->RegisterEnumValue("FaceCameraMode", "FC_DIRECTION", FC_DIRECTION);
 
     engine->RegisterObjectType("Billboard", 0, asOBJ_REF);

+ 1 - 1
Source/Urho3D/Graphics/BillboardSet.cpp

@@ -52,7 +52,7 @@ const char* faceCameraModeNames[] =
     "Rotate Y",
     "LookAt XYZ",
     "LookAt Y",
-    "LookAt Y (Restricted)",
+    "LookAt Mixed",
     "Direction",
     0
 };

+ 1 - 1
Source/Urho3D/Graphics/Camera.cpp

@@ -562,7 +562,7 @@ Quaternion Camera::GetFaceCameraRotation(const Vector3& position, const Quaterni
             return Quaternion(euler.x_, euler.y_, euler.z_);
         }
 
-    case FC_LOOKAT_Y_RESTRICTED:
+    case FC_LOOKAT_MIXED:
         {
             // Make the Y-only lookat happen on an XZ plane to make sure there are no unwanted transitions
             // or singularities

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

@@ -352,7 +352,7 @@ enum FaceCameraMode
     FC_ROTATE_Y,
     FC_LOOKAT_XYZ,
     FC_LOOKAT_Y,
-    FC_LOOKAT_Y_RESTRICTED,
+    FC_LOOKAT_MIXED,
     FC_DIRECTION,
 };
 

+ 1 - 0
Source/Urho3D/LuaScript/pkgs/Graphics/GraphicsDefs.pkg

@@ -201,6 +201,7 @@ enum FaceCameraMode
     FC_ROTATE_Y,
     FC_LOOKAT_XYZ,
     FC_LOOKAT_Y,
+    FC_LOOKAT_MIXED,
     FC_DIRECTION
 };
 

+ 2 - 1
Source/Urho3D/LuaScript/pkgs/UI/Text3D.pkg

@@ -7,7 +7,8 @@ enum FaceCameraMode
     FC_ROTATE_XYZ,
     FC_ROTATE_Y,
     FC_LOOKAT_XYZ,
-    FC_LOOKAT_Y
+    FC_LOOKAT_Y,
+    FC_LOOKAT_MIXED
 };
 
 class Text3D : public Drawable