1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00

better double comparisons for var. Fix for VS2005/VS2010 RTAS exporting. Minor GL cleanups and project updates.

This commit is contained in:
jules 2012-03-31 16:41:05 +01:00
parent 8de9d9c6da
commit 4e1a9f6526
10 changed files with 50 additions and 68 deletions

View file

@ -63,13 +63,8 @@ public:
glView.clear();
}
void initialiseOnRenderThread()
{
}
void shutdownOnRenderThread()
{
}
void initialiseOnRenderThread() {}
void shutdownOnRenderThread() {}
bool makeActive() const noexcept { return isInsideGLCallback; }
bool isActive() const noexcept { return isInsideGLCallback; }
@ -93,10 +88,6 @@ public:
}
}
void contextChangedSize()
{
}
void triggerRepaint()
{
glView.callVoidMethod (OpenGLView.requestRender);
@ -104,6 +95,7 @@ public:
//==============================================================================
void contextCreatedCallback();
void contextChangedSize() {}
void renderCallback();
//==============================================================================
@ -168,16 +160,10 @@ JUCE_JNI_CALLBACK (GL_VIEW_CLASS_NAME, contextCreated, void, (JNIEnv* env, jobje
threadLocalJNIEnvHolder.getOrAttach();
OpenGLContext::NativeContext* const context = OpenGLContext::NativeContext::findContextFor (env, view);
jassert (context != nullptr);
if (context != nullptr)
{
context->contextCreatedCallback();
JUCE_CHECK_OPENGL_ERROR
}
else
{
jassertfalse;
}
}
JUCE_JNI_CALLBACK (GL_VIEW_CLASS_NAME, contextChangedSize, void, (JNIEnv* env, jobject view))