Last changes
This commit is contained in:
committed by
Jérôme Leclercq
parent
cee75dcc11
commit
5a57aca66a
@@ -32,7 +32,10 @@ namespace Nz
|
||||
{
|
||||
ApplicationBase* app = static_cast<ApplicationBase*>(application);
|
||||
if (!app->m_running)
|
||||
{
|
||||
emscripten_cancel_main_loop();
|
||||
return;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
@@ -44,6 +47,7 @@ namespace Nz
|
||||
NazaraError(e.what());
|
||||
}
|
||||
}, this, 0, 1);
|
||||
emscripten_set_main_loop_timing(EM_TIMING_RAF, 1);
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -169,7 +169,7 @@ namespace Nz
|
||||
IpAddress::IPv6 address = ipAddress.ToIPv6();
|
||||
for (unsigned int i = 0; i < 8; ++i)
|
||||
{
|
||||
u_short addressPart = htons(address[i]);
|
||||
UInt16 addressPart = htons(address[i]);
|
||||
socketAddress->sin6_addr.s6_addr[i * 2 + 0] = addressPart >> 0;
|
||||
socketAddress->sin6_addr.s6_addr[i * 2 + 1] = addressPart >> 8;
|
||||
}
|
||||
|
||||
@@ -322,8 +322,8 @@ namespace Nz
|
||||
}
|
||||
}
|
||||
|
||||
/*if (!invalidateAttachments.empty())
|
||||
context->glInvalidateFramebuffer(GL_FRAMEBUFFER, GLsizei(invalidateAttachments.size()), invalidateAttachments.data());*/
|
||||
if (!invalidateAttachments.empty())
|
||||
context->glInvalidateFramebuffer(GL_FRAMEBUFFER, GLsizei(invalidateAttachments.size()), invalidateAttachments.data());
|
||||
}
|
||||
else
|
||||
static_assert(AlwaysFalse<T>::value, "non-exhaustive visitor");
|
||||
|
||||
@@ -431,7 +431,7 @@ namespace Nz::GL
|
||||
|
||||
try
|
||||
{
|
||||
#define NAZARA_OPENGLRENDERER_FUNC(name, sig) loader.Load<sig, UnderlyingCast(FunctionIndex:: name)>(name, #name, false, true);
|
||||
#define NAZARA_OPENGLRENDERER_FUNC(name, sig) loader.Load<sig, UnderlyingCast(FunctionIndex:: name)>(name, #name, true, true);
|
||||
#define NAZARA_OPENGLRENDERER_EXT_FUNC(name, sig) //< Do nothing
|
||||
NAZARA_OPENGLRENDERER_FOREACH_GLES_FUNC(NAZARA_OPENGLRENDERER_FUNC, NAZARA_OPENGLRENDERER_EXT_FUNC)
|
||||
#undef NAZARA_OPENGLRENDERER_EXT_FUNC
|
||||
|
||||
@@ -165,6 +165,7 @@ namespace Nz::GL
|
||||
{
|
||||
case WindowBackend::Invalid:
|
||||
case WindowBackend::Cocoa: //< TODO?
|
||||
case WindowBackend::Web: //< TODO?
|
||||
break;
|
||||
|
||||
case WindowBackend::X11:
|
||||
|
||||
Reference in New Issue
Block a user