Selaa lähdekoodia

Conformity with the engine code conventions

marco.bellan 9 vuotta sitten
vanhempi
sitoutus
63b00eadef

+ 1 - 3
Source/BansheeEditor/Include/BsEditorUtility.h

@@ -27,9 +27,7 @@ namespace BansheeEngine
 		 */
 		static AABox calculateBounds(const Vector<HSceneObject>& objects);
 
-		/**
-		 * Calculates world space center of the specified scene objects.
-		 */
+		/** Calculates world space center of the specified scene objects. */
 		static Vector3 calculateCenter(const Vector<HSceneObject>& objects);
 
 	private:

+ 2 - 5
Source/BansheeEditor/Source/BsEditorUtility.cpp

@@ -26,11 +26,7 @@ namespace BansheeEngine
 			AABox meshBounds;
 			if (calculateMeshBounds(object, meshBounds))
 			{
-				if (meshBounds.getSize() == Vector3::INF)
-					bounds.merge(object->getWorldPosition());
-				else
-					bounds.merge(meshBounds);
-				
+				bounds.merge(meshBounds);
 				gotOneMesh = true;
 			}
 		}
@@ -72,6 +68,7 @@ namespace BansheeEngine
 					center += object->getWorldPosition();
 				else
 					center += meshBounds.getCenter();
+
 				gotOneMesh = true;
 			}
 		}

+ 0 - 1
Source/MBansheeEditor/Utility/EditorUtility.cs

@@ -53,7 +53,6 @@ namespace BansheeEditor
         {
             Vector3 center;
             Internal_CalculateArrayCenter(objects, out center);
-            Debug.Log(center);
             return center;
         }