Pārlūkot izejas kodu

Merge pull request #500 from fodinabor/getRotationEuler

Make getRotation more consistent: *replaced getEulerRotation with getRot...
Ivan Safrin 11 gadi atpakaļ
vecāks
revīzija
db15986698

+ 1 - 1
Core/Contents/Include/PolyEntity.h

@@ -393,7 +393,7 @@ namespace Polycode {
              * Returns the entity's rotation as euler angles
              * Returns the entity's rotation as euler angles
              @return Entity's rotation as euler angles
              @return Entity's rotation as euler angles
              */
              */
-            Vector3 getEulerRotation() const;
+            Vector3 getRotationEuler() const;
 		
 		
 			/**
 			/**
 			* Returns the entity's pitch combined with the combined pitch of its parent.
 			* Returns the entity's pitch combined with the combined pitch of its parent.

+ 1 - 1
Core/Contents/Source/PolyEntity.cpp

@@ -709,7 +709,7 @@ Vector3 Entity::getScale() const {
 	return scale;
 	return scale;
 }
 }
 
 
-Vector3 Entity::getEulerRotation() const {
+Vector3 Entity::getRotationEuler() const {
     return rotation;
     return rotation;
 }
 }
 
 

+ 3 - 3
IDE/Contents/Source/PolycodeProps.cpp

@@ -2526,9 +2526,9 @@ void TransformSheet::Update() {
         lastScale = entity->getScale();
         lastScale = entity->getScale();
     }
     }
     
     
-    if(entity->getEulerRotation() != lastRotation) {
-        rotationProp->set(entity->getEulerRotation());
-        lastRotation = entity->getEulerRotation();
+    if(entity->getRotationEuler() != lastRotation) {
+        rotationProp->set(entity->getRotationEuler());
+        lastRotation = entity->getRotationEuler();
     }
     }
 }
 }