BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Renamed IsAnyParentMissingTransform -> isAnyParentMissingTransform (member function).

Browse Source
This commit is contained in:
stiffly
2016-03-07 14:34:45 +01:00
parent a369c26a28
commit 9cc8124847
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Engine/Editor/EditorSystem.h
+1 -1
View File
@@ -47,7 +47,7 @@ private:
// Utility functions // Utility functions
EntityWrapper importEntity(EntityWrapper parent, boost::filesystem::path filePath); EntityWrapper importEntity(EntityWrapper parent, boost::filesystem::path filePath);
void setWidgetMode(EditorGUI::WidgetMode mode); void setWidgetMode(EditorGUI::WidgetMode mode);
bool IsAnyParentMissingTransform(EntityID entityID); bool isAnyParentMissingTransform(EntityID entityID);
// GUI callbacks // GUI callbacks
void OnEntitySelected(EntityWrapper entity); void OnEntitySelected(EntityWrapper entity);
src/Engine/Editor/EditorSystem.cpp
+3 -3
View File
@@ -70,7 +70,7 @@ void EditorSystem::Update(double dt)
m_EditorGUI->Draw(); m_EditorGUI->Draw();
m_EditorStats->Draw(actualDelta); m_EditorStats->Draw(actualDelta);
if (IsAnyParentMissingTransform(m_CurrentSelection.ID)) { if (isAnyParentMissingTransform(m_CurrentSelection.ID)) {
return; return;
} }
if (m_CurrentSelection.Valid() && m_Widget.Valid()) { if (m_CurrentSelection.Valid() && m_Widget.Valid()) {
@@ -205,7 +205,7 @@ bool EditorSystem::OnMousePress(const Events::MousePress& e)
bool EditorSystem::OnWidgetDelta(const Events::WidgetDelta& e) bool EditorSystem::OnWidgetDelta(const Events::WidgetDelta& e)
{ {
if (m_CurrentSelection.Valid()) { if (m_CurrentSelection.Valid()) {
if (IsAnyParentMissingTransform(m_CurrentSelection.ID)) { if (isAnyParentMissingTransform(m_CurrentSelection.ID)) {
return false; return false;
} }
if (m_WidgetSpace == EditorGUI::WidgetSpace::Global) { if (m_WidgetSpace == EditorGUI::WidgetSpace::Global) {
@@ -308,7 +308,7 @@ void EditorSystem::setWidgetMode(EditorGUI::WidgetMode mode)
m_Widget["Transform"]["Position"] = Transform::AbsolutePosition(m_CurrentSelection.World, m_CurrentSelection.ID); m_Widget["Transform"]["Position"] = Transform::AbsolutePosition(m_CurrentSelection.World, m_CurrentSelection.ID);
} }
bool EditorSystem::IsAnyParentMissingTransform(EntityID entityID) bool EditorSystem::isAnyParentMissingTransform(EntityID entityID)
{ {
EntityWrapper entity(m_World, entityID); EntityWrapper entity(m_World, entityID);
while (entity.Parent().Valid()) { while (entity.Parent().Valid()) {