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

Use NullCheckedInvocation in more places

Browse source
This commit is contained in:
Tom Poole 2023-09-26 11:06:31 +01:00
parent 84750f2f2a
commit ff0cb4ad5b
46 changed files with 145 additions and 258 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/GUI/CameraDemo.h
View file

@ -123,7 +123,7 @@ public:
auto previewArea = shouldUseLandscapeLayout() ? r.removeFromLeft (r.getWidth() / 2)
: r.removeFromTop (r.getHeight() / 2);
if (cameraPreviewComp.get() != nullptr)
if (cameraPreviewComp != nullptr)
cameraPreviewComp->setBounds (previewArea);
if (shouldUseLandscapeLayout())

12
examples/GUI/OpenGLAppDemo.h
View file

@ -120,10 +120,10 @@ public:
shader->use();
if (uniforms->projectionMatrix.get() != nullptr)
if (uniforms->projectionMatrix != nullptr)
uniforms->projectionMatrix->setMatrix4 (getProjectionMatrix().mat, 1, false);
if (uniforms->viewMatrix.get() != nullptr)
if (uniforms->viewMatrix != nullptr)
uniforms->viewMatrix->setMatrix4 (getViewMatrix().mat, 1, false);
shape->draw (*attributes);
@ -276,10 +276,10 @@ private:
{
using namespace ::juce::gl;
if (position.get() != nullptr) glDisableVertexAttribArray (position->attributeID);
if (normal.get() != nullptr) glDisableVertexAttribArray (normal->attributeID);
if (sourceColour.get() != nullptr) glDisableVertexAttribArray (sourceColour->attributeID);
if (textureCoordIn.get() != nullptr) glDisableVertexAttribArray (textureCoordIn->attributeID);
if (position != nullptr) glDisableVertexAttribArray (position->attributeID);
if (normal != nullptr) glDisableVertexAttribArray (normal->attributeID);
if (sourceColour != nullptr) glDisableVertexAttribArray (sourceColour->attributeID);
if (textureCoordIn != nullptr) glDisableVertexAttribArray (textureCoordIn->attributeID);
}
std::unique_ptr<OpenGLShaderProgram::Attribute> position, normal, sourceColour, textureCoordIn;

20
examples/GUI/OpenGLDemo.h
View file

@ -110,10 +110,10 @@ struct OpenGLUtils
{
using namespace ::juce::gl;
if (position.get() != nullptr) glDisableVertexAttribArray (position->attributeID);
if (normal.get() != nullptr) glDisableVertexAttribArray (normal->attributeID);
if (sourceColour.get() != nullptr) glDisableVertexAttribArray (sourceColour->attributeID);
if (textureCoordIn.get() != nullptr) glDisableVertexAttribArray (textureCoordIn->attributeID);
if (position != nullptr) glDisableVertexAttribArray (position->attributeID);
if (normal != nullptr) glDisableVertexAttribArray (normal->attributeID);
if (sourceColour != nullptr) glDisableVertexAttribArray (sourceColour->attributeID);
if (textureCoordIn != nullptr) glDisableVertexAttribArray (textureCoordIn->attributeID);
}
std::unique_ptr<OpenGLShaderProgram::Attribute> position, normal, sourceColour, textureCoordIn;
@ -784,7 +784,7 @@ public:
// on demand, during the render callback.
freeAllContextObjects();
if (controlsOverlay.get() != nullptr)
if (controlsOverlay != nullptr)
controlsOverlay->updateShader();
}
@ -857,19 +857,19 @@ public:
shader->use();
if (uniforms->projectionMatrix.get() != nullptr)
if (uniforms->projectionMatrix != nullptr)
uniforms->projectionMatrix->setMatrix4 (getProjectionMatrix().mat, 1, false);
if (uniforms->viewMatrix.get() != nullptr)
if (uniforms->viewMatrix != nullptr)
uniforms->viewMatrix->setMatrix4 (getViewMatrix().mat, 1, false);
if (uniforms->texture.get() != nullptr)
if (uniforms->texture != nullptr)
uniforms->texture->set ((GLint) 0);
if (uniforms->lightPosition.get() != nullptr)
if (uniforms->lightPosition != nullptr)
uniforms->lightPosition->set (-15.0f, 10.0f, 15.0f, 0.0f);
if (uniforms->bouncingNumber.get() != nullptr)
if (uniforms->bouncingNumber != nullptr)
uniforms->bouncingNumber->set (bouncingNumber.getValue());
shape->draw (*attributes);