sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into console-widget

Browse Source
This commit is contained in:
Lynix
2017-02-23 00:47:12 +01:00
parent 2baaaaa554 55d9a22665
commit f00359072f
81 changed files with 802 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
SDK/src/NDK/Entity.cpp
View File

@@ -158,11 +158,16 @@ namespace Ndk
}
m_systemBits.Clear();
UnregisterAllHandles();
// We properly destroy each component
for (std::size_t i = m_componentBits.FindFirst(); i != m_componentBits.npos; i = m_componentBits.FindNext(i))
m_components[i]->SetEntity(nullptr);
m_components.clear();
m_componentBits.Reset();
// And then free every handle
UnregisterAllHandles();
m_valid = false;
}

12
SDK/src/NDK/Lua/LuaBinding_SDK.cpp
View File

@@ -85,23 +85,23 @@ namespace Ndk
entity.BindMethod("AddComponent", [this] (Nz::LuaInstance& instance, EntityHandle& handle, std::size_t /*argumentCount*/) -> int
{
LuaBinding::ComponentBinding* binding = m_binding.QueryComponentIndex(instance);
LuaBinding::ComponentBinding* bindingComponent = m_binding.QueryComponentIndex(instance);
return binding->adder(instance, handle);
return bindingComponent->adder(instance, handle);
});
entity.BindMethod("GetComponent", [this] (Nz::LuaInstance& instance, EntityHandle& handle, std::size_t /*argumentCount*/) -> int
{
LuaBinding::ComponentBinding* binding = m_binding.QueryComponentIndex(instance);
LuaBinding::ComponentBinding* bindingComponent = m_binding.QueryComponentIndex(instance);
return binding->getter(instance, handle->GetComponent(binding->index));
return bindingComponent->getter(instance, handle->GetComponent(bindingComponent->index));
});
entity.BindMethod("RemoveComponent", [this] (Nz::LuaInstance& instance, EntityHandle& handle, std::size_t /*argumentCount*/) -> int
{
LuaBinding::ComponentBinding* binding = m_binding.QueryComponentIndex(instance);
LuaBinding::ComponentBinding* bindingComponent = m_binding.QueryComponentIndex(instance);
handle->RemoveComponent(binding->index);
handle->RemoveComponent(bindingComponent->index);
return 0;
});
}

5
SDK/src/NDK/Widgets/ButtonWidget.cpp
View File

@@ -61,10 +61,7 @@ namespace Ndk
m_gradientSprite->SetColor(Nz::Color(128, 128, 128));
}
void ButtonWidget::OnMouseMoved(int x, int y, int deltaX, int deltaY)
{
}
void ButtonWidget::OnMouseExit()
{
m_gradientSprite->SetColor(Nz::Color(74, 74, 74));