|
|
@@ -62,7 +62,7 @@ class Node : public Serializable
|
|
|
void Roll(float angle, bool fixedAxis = false);
|
|
|
|
|
|
void LookAt(const Vector3& target, const Vector3& upAxis = Vector3::UP);
|
|
|
- tolua_outside void NodeLookAtXYZ @ LookAtXYZ(float x, float y, float z, float upX = 0.0f, float upY = 0.0f, float upZ = 1.0f);
|
|
|
+ tolua_outside void NodeLookAtXYZ @ LookAtXYZ(float x, float y, float z, float upX = 0.0f, float upY = 1.0f, float upZ = 0.0f);
|
|
|
|
|
|
void Scale(float scale);
|
|
|
void Scale(const Vector3& scale);
|
|
|
@@ -248,7 +248,7 @@ static void NodeRotateXYZ(Node* node, float x, float y, float z, bool fixedAxis
|
|
|
node->Rotate(Quaternion(x, y, z), fixedAxis);
|
|
|
}
|
|
|
|
|
|
-static void NodeLookAtXYZ(Node* node, float x, float y, float z, float upX = 0.0f, float upY = 0.0f, float upZ = 1.0f)
|
|
|
+static void NodeLookAtXYZ(Node* node, float x, float y, float z, float upX = 0.0f, float upY = 1.0f, float upZ = 0.0f)
|
|
|
{
|
|
|
node->LookAt(Vector3(x, y, z), Vector3(upX, upY, upZ));
|
|
|
}
|