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

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

This commit is contained in:
Lynix 2017-02-23 09:29:11 +01:00
parent 7c22ee637e 55d9a22665
commit 745a9d12b0
5 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SDK/include/NDK/BaseWidget.inl
View File

@ -33,6 +33,7 @@ namespace Ndk
inline void BaseWidget::AddChild(std::unique_ptr<BaseWidget>&& widget)
{
widget->Show(m_visible);
widget->SetParent(this);
m_children.emplace_back(std::move(widget));
}

1
SDK/include/NDK/Widgets/ButtonWidget.hpp
View File

@ -40,7 +40,6 @@ namespace Ndk
void Layout() override;
void OnMouseEnter() override;
void OnMouseMoved(int x, int y, int deltaX, int deltaY) override;
void OnMouseButtonRelease(int x, int y, Nz::Mouse::Button button) override;
void OnMouseExit() override;

2
SDK/src/NDK/Console.cpp
View File

@ -300,7 +300,7 @@ namespace Ndk
void Console::ExecuteInput()
{
Nz::String input = m_inputDrawer.GetText();
Nz::String inputCmd = input.SubString(s_inputPrefixSize);;
Nz::String inputCmd = input.SubString(s_inputPrefixSize);
m_inputDrawer.SetText(s_inputPrefix);
if (m_commandHistory.empty() || m_commandHistory.back() != inputCmd)

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));

14
src/Nazara/Renderer/ContextParameters.cpp
View File

@ -8,28 +8,28 @@
namespace Nz
{
// Version majeure d'OpenGL, initialisé par OpenGL::Initialize()
// Major version of OpenGL, initialised by OpenGL::Initialize()
UInt8 ContextParameters::defaultMajorVersion;
// Version majeure d'OpenGL, initialisé par OpenGL::Initialize()
// Minor version of OpenGL, initialised by OpenGL::Initialize()
UInt8 ContextParameters::defaultMinorVersion;
// Contexte de partage par défaut, initialisé par OpenGL::Initialize()
// Context of default sharing, initialised by OpenGL::Initialize()
const Context* ContextParameters::defaultShareContext = nullptr;
// Si possible, garder la compatibilité avec les fonctionnalités dépréciées
// If it's possible, keep the compatibility with deprecated functionalities
bool ContextParameters::defaultCompatibilityProfile = false;
// Mode debug d'OpenGL par défaut
// Default debug mode of OpenGL
#if NAZARA_RENDERER_OPENGL_DEBUG || defined(NAZARA_DEBUG)
bool ContextParameters::defaultDebugMode = true;
#else
bool ContextParameters::defaultDebugMode = false;
#endif
// Active le double-buffering sur les contextes
// Enables double-buffering on contexts Active le double-buffering sur les contextes
bool ContextParameters::defaultDoubleBuffered = false;
// Active le partage des ressources entre contextes (Via le defaultShareContext)
// Enables ressource sharing on contexts (via defaultShareContext)
bool ContextParameters::defaultShared = true;
}