DISTRHO
/
JUCE
mirror of https://github.com/DISTRHO/JUCE
1
0
Fork 0
Code Releases 1 Activity
Browse Source

Removed the OpenGLRenderingTarget class (which wasn't a good fit with the way openGL actually works)

tags/2021-05-28
jules 13 years ago
parent
9b16df83cf
commit
7c486b83d8
19 changed files with 15 additions and 113 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +0
    -2
      extras/JuceDemo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj
  2. +0
    -1
      extras/JuceDemo/Builds/VisualStudio2005/Juce Demo.vcproj
  3. +0
    -1
      extras/JuceDemo/Builds/VisualStudio2008/Juce Demo.vcproj
  4. +0
    -1
      extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj
  5. +0
    -3
      extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj.filters
  6. +0
    -2
      extras/JuceDemo/Builds/iOS/Juce Demo.xcodeproj/project.pbxproj
  7. +0
    -2
      extras/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj
  8. +0
    -1
      extras/audio plugin host/Builds/VisualStudio2005/Plugin Host.vcproj
  9. +0
    -1
      extras/audio plugin host/Builds/VisualStudio2008/Plugin Host.vcproj
  10. +0
    -2
      extras/static library/Builds/MacOSX/juce.xcodeproj/project.pbxproj
  11. +0
    -1
      extras/static library/Builds/VisualStudio2008/juce.vcproj
  12. +0
    -1
      extras/static library/Builds/VisualStudio2010/juce.vcxproj
  13. +0
    -3
      extras/static library/Builds/VisualStudio2010/juce.vcxproj.filters
  14. +0
    -3
      modules/juce_opengl/juce_opengl.h
  15. +1
    -5
      modules/juce_opengl/opengl/juce_OpenGLComponent.h
  16. +1
    -4
      modules/juce_opengl/opengl/juce_OpenGLFrameBuffer.h
  17. +2
    -11
      modules/juce_opengl/opengl/juce_OpenGLHelpers.cpp
  18. +11
    -12
      modules/juce_opengl/opengl/juce_OpenGLHelpers.h
  19. +0
    -57
      modules/juce_opengl/opengl/juce_OpenGLRenderingTarget.h

+ 0
- 2
extras/JuceDemo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj View File

@@ -572,7 +572,6 @@
936C6419223D7B28CE16A72B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_BufferedInputStream.cpp"; path = "../../../../modules/juce_core/streams/juce_BufferedInputStream.cpp"; sourceTree = "SOURCE_ROOT"; };
9398049BFCAC42B8FD1E16C5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DirectXPluginFormat.h"; path = "../../../../modules/juce_audio_processors/format_types/juce_DirectXPluginFormat.h"; sourceTree = "SOURCE_ROOT"; };
93C594ECD5CEA7878114149A = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_WebBrowserComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_win32_WebBrowserComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
942191F317B1B2B1CFBB7C60 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_OpenGLRenderingTarget.h"; path = "../../../../modules/juce_opengl/opengl/juce_OpenGLRenderingTarget.h"; sourceTree = "SOURCE_ROOT"; };
94A9A7DF00C64509E9B5A337 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = QuickTimeDemo.cpp; path = ../../Source/demos/QuickTimeDemo.cpp; sourceTree = "SOURCE_ROOT"; };
94EB4630C360BA31195FA13D = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioIODeviceType.cpp"; path = "../../../../modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.cpp"; sourceTree = "SOURCE_ROOT"; };
95305C4003CD4784CA20D1D1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TextEditorKeyMapper.h"; path = "../../../../modules/juce_gui_basics/keyboard/juce_TextEditorKeyMapper.h"; sourceTree = "SOURCE_ROOT"; };
@@ -1908,7 +1907,6 @@
E46977801F19277F4D3B324B,
17422D876DAAF091ED089B8D,
B81FA2ED22BCC03D124031ED,
942191F317B1B2B1CFBB7C60,
58864C3D7F369EBE01E42C5C,
8EEB4DEB11F3DF01BA6F7528,
FE9A5898294228EB7F439951,


+ 0
- 1
extras/JuceDemo/Builds/VisualStudio2005/Juce Demo.vcproj View File

@@ -4311,7 +4311,6 @@
</File>
<File RelativePath="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLImage.h"/>
<File RelativePath="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLPixelFormat.h"/>
<File RelativePath="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLRenderingTarget.h"/>
<File RelativePath="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLShaderProgram.cpp">
<FileConfiguration Name="Debug|Win32"
ExcludedFromBuild="true">


+ 0
- 1
extras/JuceDemo/Builds/VisualStudio2008/Juce Demo.vcproj View File

@@ -4311,7 +4311,6 @@
</File>
<File RelativePath="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLImage.h"/>
<File RelativePath="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLPixelFormat.h"/>
<File RelativePath="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLRenderingTarget.h"/>
<File RelativePath="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLShaderProgram.cpp">
<FileConfiguration Name="Debug|Win32"
ExcludedFromBuild="true">


+ 0
- 1
extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj View File

@@ -1610,7 +1610,6 @@
<ClInclude Include="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLHelpers.h"/>
<ClInclude Include="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLImage.h"/>
<ClInclude Include="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLPixelFormat.h"/>
<ClInclude Include="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLRenderingTarget.h"/>
<ClInclude Include="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLShaderProgram.h"/>
<ClInclude Include="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLTexture.h"/>
<ClInclude Include="..\..\..\..\modules\juce_opengl\opengl\juce_Quaternion.h"/>


+ 0
- 3
extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj.filters View File

@@ -2829,9 +2829,6 @@
<ClInclude Include="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLPixelFormat.h">
<Filter>Juce Modules\juce_opengl\opengl</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLRenderingTarget.h">
<Filter>Juce Modules\juce_opengl\opengl</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLShaderProgram.h">
<Filter>Juce Modules\juce_opengl\opengl</Filter>
</ClInclude>


+ 0
- 2
extras/JuceDemo/Builds/iOS/Juce Demo.xcodeproj/project.pbxproj View File

@@ -565,7 +565,6 @@
936C6419223D7B28CE16A72B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_BufferedInputStream.cpp"; path = "../../../../modules/juce_core/streams/juce_BufferedInputStream.cpp"; sourceTree = "SOURCE_ROOT"; };
9398049BFCAC42B8FD1E16C5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DirectXPluginFormat.h"; path = "../../../../modules/juce_audio_processors/format_types/juce_DirectXPluginFormat.h"; sourceTree = "SOURCE_ROOT"; };
93C594ECD5CEA7878114149A = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_WebBrowserComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_win32_WebBrowserComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
942191F317B1B2B1CFBB7C60 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_OpenGLRenderingTarget.h"; path = "../../../../modules/juce_opengl/opengl/juce_OpenGLRenderingTarget.h"; sourceTree = "SOURCE_ROOT"; };
94A9A7DF00C64509E9B5A337 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = QuickTimeDemo.cpp; path = ../../Source/demos/QuickTimeDemo.cpp; sourceTree = "SOURCE_ROOT"; };
94EB4630C360BA31195FA13D = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioIODeviceType.cpp"; path = "../../../../modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.cpp"; sourceTree = "SOURCE_ROOT"; };
95305C4003CD4784CA20D1D1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TextEditorKeyMapper.h"; path = "../../../../modules/juce_gui_basics/keyboard/juce_TextEditorKeyMapper.h"; sourceTree = "SOURCE_ROOT"; };
@@ -1900,7 +1899,6 @@
E46977801F19277F4D3B324B,
17422D876DAAF091ED089B8D,
B81FA2ED22BCC03D124031ED,
942191F317B1B2B1CFBB7C60,
58864C3D7F369EBE01E42C5C,
8EEB4DEB11F3DF01BA6F7528,
FE9A5898294228EB7F439951,


+ 0
- 2
extras/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj View File

@@ -346,7 +346,6 @@
582D00AF5D2B03D99D395C5D = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LowLevelGraphicsSoftwareRenderer.h"; path = "../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h"; sourceTree = "SOURCE_ROOT"; };
5855BA9AD11D9A3AE9FAF972 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Result.h"; path = "../../../../modules/juce_core/misc/juce_Result.h"; sourceTree = "SOURCE_ROOT"; };
589769409FB8620A45B85335 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LowLevelGraphicsPostScriptRenderer.h"; path = "../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsPostScriptRenderer.h"; sourceTree = "SOURCE_ROOT"; };
597D5688E23397FE09F53BA3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_OpenGLRenderingTarget.h"; path = "../../../../modules/juce_opengl/opengl/juce_OpenGLRenderingTarget.h"; sourceTree = "SOURCE_ROOT"; };
599F30CF78998EA6657D56A0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MixerAudioSource.cpp"; path = "../../../../modules/juce_audio_basics/sources/juce_MixerAudioSource.cpp"; sourceTree = "SOURCE_ROOT"; };
5A835BB9C7C51847701951A1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_OutputStream.h"; path = "../../../../modules/juce_core/streams/juce_OutputStream.h"; sourceTree = "SOURCE_ROOT"; };
5AA6D24CBDEC48447451F46A = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_gui_extra.mm"; path = "../../../../modules/juce_gui_extra/juce_gui_extra.mm"; sourceTree = "SOURCE_ROOT"; };
@@ -1830,7 +1829,6 @@
C0EECABDA5446EAD76E2578F,
4CE76ABC51CC5E019AED3C2B,
8BA1AF085755958342C9213A,
597D5688E23397FE09F53BA3,
DFE18134F58A9C546AD16FF7,
442E6311FB54378E88B6811C,
651055751E902F40B83EFD55,


+ 0
- 1
extras/audio plugin host/Builds/VisualStudio2005/Plugin Host.vcproj View File

@@ -4234,7 +4234,6 @@
</File>
<File RelativePath="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLImage.h"/>
<File RelativePath="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLPixelFormat.h"/>
<File RelativePath="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLRenderingTarget.h"/>
<File RelativePath="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLShaderProgram.cpp">
<FileConfiguration Name="Debug|Win32"
ExcludedFromBuild="true">


+ 0
- 1
extras/audio plugin host/Builds/VisualStudio2008/Plugin Host.vcproj View File

@@ -4234,7 +4234,6 @@
</File>
<File RelativePath="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLImage.h"/>
<File RelativePath="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLPixelFormat.h"/>
<File RelativePath="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLRenderingTarget.h"/>
<File RelativePath="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLShaderProgram.cpp">
<FileConfiguration Name="Debug|Win32"
ExcludedFromBuild="true">


+ 0
- 2
extras/static library/Builds/MacOSX/juce.xcodeproj/project.pbxproj View File

@@ -511,7 +511,6 @@
9D4FC9BEE122256B2557D088 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_OpenGLFrameBuffer.h"; path = "../../../../modules/juce_opengl/opengl/juce_OpenGLFrameBuffer.h"; sourceTree = "SOURCE_ROOT"; };
9D7F83D461E62DDA82C74EA8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_PropertyPanel.cpp"; path = "../../../../modules/juce_gui_basics/properties/juce_PropertyPanel.cpp"; sourceTree = "SOURCE_ROOT"; };
9D9D7797A0B32F28838D8FC7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_GZIPCompressorOutputStream.h"; path = "../../../../modules/juce_core/zip/juce_GZIPCompressorOutputStream.h"; sourceTree = "SOURCE_ROOT"; };
9E067C6101B6E2D11365EBDC = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_OpenGLRenderingTarget.h"; path = "../../../../modules/juce_opengl/opengl/juce_OpenGLRenderingTarget.h"; sourceTree = "SOURCE_ROOT"; };
9E7E5C859FFDA600253B3379 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ScopedPointer.h"; path = "../../../../modules/juce_core/memory/juce_ScopedPointer.h"; sourceTree = "SOURCE_ROOT"; };
9E80E6825A34DD1E15D0F61C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_HeapBlock.h"; path = "../../../../modules/juce_core/memory/juce_HeapBlock.h"; sourceTree = "SOURCE_ROOT"; };
9EAEFA0E956265487E7A3919 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ios_Audio.cpp"; path = "../../../../modules/juce_audio_devices/native/juce_ios_Audio.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -1749,7 +1748,6 @@
6DCD8800E380DB691DC9D467,
7251827C30AC1C4F55C3DB69,
6D95302F8D68BA3F0538214F,
9E067C6101B6E2D11365EBDC,
1DC59B4A97D5DF77801ACAE8,
F7010D646D19C704DE9D42A1,
A0D54F01BC8018CC41FA34E9,


+ 0
- 1
extras/static library/Builds/VisualStudio2008/juce.vcproj View File

@@ -4125,7 +4125,6 @@
</File>
<File RelativePath="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLImage.h"/>
<File RelativePath="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLPixelFormat.h"/>
<File RelativePath="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLRenderingTarget.h"/>
<File RelativePath="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLShaderProgram.cpp">
<FileConfiguration Name="Debug|Win32"
ExcludedFromBuild="true">


+ 0
- 1
extras/static library/Builds/VisualStudio2010/juce.vcxproj View File

@@ -1556,7 +1556,6 @@
<ClInclude Include="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLHelpers.h"/>
<ClInclude Include="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLImage.h"/>
<ClInclude Include="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLPixelFormat.h"/>
<ClInclude Include="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLRenderingTarget.h"/>
<ClInclude Include="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLShaderProgram.h"/>
<ClInclude Include="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLTexture.h"/>
<ClInclude Include="..\..\..\..\modules\juce_opengl\opengl\juce_Quaternion.h"/>


+ 0
- 3
extras/static library/Builds/VisualStudio2010/juce.vcxproj.filters View File

@@ -2664,9 +2664,6 @@
<ClInclude Include="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLPixelFormat.h">
<Filter>Juce Modules\juce_opengl\opengl</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLRenderingTarget.h">
<Filter>Juce Modules\juce_opengl\opengl</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\modules\juce_opengl\opengl\juce_OpenGLShaderProgram.h">
<Filter>Juce Modules\juce_opengl\opengl</Filter>
</ClInclude>


+ 0
- 3
modules/juce_opengl/juce_opengl.h View File

@@ -107,9 +107,6 @@ BEGIN_JUCE_NAMESPACE
#ifndef __JUCE_OPENGLPIXELFORMAT_JUCEHEADER__
#include "opengl/juce_OpenGLPixelFormat.h"
#endif
#ifndef __JUCE_OPENGLRENDERINGTARGET_JUCEHEADER__
#include "opengl/juce_OpenGLRenderingTarget.h"
#endif
#ifndef __JUCE_OPENGLSHADERPROGRAM_JUCEHEADER__
#include "opengl/juce_OpenGLShaderProgram.h"
#endif


+ 1
- 5
modules/juce_opengl/opengl/juce_OpenGLComponent.h View File

@@ -44,8 +44,7 @@ class OpenGLGraphicsContext;
method to draw its contents.
*/
class JUCE_API OpenGLComponent : public OpenGLBaseType,
public OpenGLRenderingTarget
class JUCE_API OpenGLComponent : public OpenGLBaseType
{
public:
//==============================================================================
@@ -192,9 +191,6 @@ public:
*/
void releaseAsRenderingTarget();
int getRenderingTargetWidth() const { return getWidth(); }
int getRenderingTargetHeight() const { return getHeight(); }
/** Causes a repaint to be invoked asynchronously.
This has a similar effect to calling repaint(), and triggers a callback to
renderOpenGL(), but unlike repaint(), it does not mark any of the component's


+ 1
- 4
modules/juce_opengl/opengl/juce_OpenGLFrameBuffer.h View File

@@ -31,7 +31,7 @@
/**
Creates an openGL frame buffer.
*/
class JUCE_API OpenGLFrameBuffer : public OpenGLRenderingTarget
class JUCE_API OpenGLFrameBuffer
{
public:
/** Creates an uninitialised buffer.
@@ -85,9 +85,6 @@ public:
/** Returns the height of the buffer. */
int getHeight() const noexcept;
int getRenderingTargetWidth() const { return getWidth(); }
int getRenderingTargetHeight() const { return getHeight(); }
/** Returns the texture ID number for using this buffer as a texture. */
GLuint getTextureID() const noexcept;


+ 2
- 11
modules/juce_opengl/opengl/juce_OpenGLHelpers.cpp View File

@@ -138,6 +138,7 @@ void OpenGLHelpers::enableScissorTest (const Rectangle<int>& clip)
glScissor (clip.getX(), clip.getY(), clip.getWidth(), clip.getHeight());
}
#if JUCE_USE_OPENGL_FIXED_FUNCTION
void OpenGLHelpers::drawQuad2D (float x1, float y1,
float x2, float y2,
float x3, float y3,
@@ -229,7 +230,6 @@ void OpenGLHelpers::fillRectWithTexture (const Rectangle<int>& rect, GLuint text
drawTextureQuad (textureID, rect);
}
//==============================================================================
void OpenGLHelpers::fillRectWithColour (const Rectangle<int>& rect, const Colour& colour)
{
glEnableClientState (GL_VERTEX_ARRAY);
@@ -250,6 +250,7 @@ void OpenGLHelpers::fillRect (const Rectangle<int>& rect)
glVertexPointer (2, GL_FLOAT, 0, vertices);
glDrawArrays (GL_TRIANGLE_STRIP, 0, 4);
}
#endif
//==============================================================================
OpenGLTextureFromImage::OpenGLTextureFromImage (const Image& image)
@@ -276,13 +277,3 @@ OpenGLTextureFromImage::OpenGLTextureFromImage (const Image& image)
}
OpenGLTextureFromImage::~OpenGLTextureFromImage() {}
//==============================================================================
OpenGLRenderingTarget::OpenGLRenderingTarget() {}
OpenGLRenderingTarget::~OpenGLRenderingTarget() {}
void OpenGLRenderingTarget::prepareFor2D()
{
OpenGLHelpers::prepareFor2D (getRenderingTargetWidth(),
getRenderingTargetHeight());
}

+ 11
- 12
modules/juce_opengl/opengl/juce_OpenGLHelpers.h View File

@@ -46,6 +46,14 @@ public:
/** Clears the current context using the given colour. */
static void clear (const Colour& colour);
static void enableScissorTest (const Rectangle<int>& clip);
/** Checks whether the current context supports the specified extension. */
static bool isExtensionSupported (const char* extensionName);
/** Returns the address of a named GL extension function */
static void* getExtensionFunction (const char* functionName);
#if JUCE_USE_OPENGL_FIXED_FUNCTION
/** Sets the current colour using a JUCE colour. */
static void setColour (const Colour& colour);
@@ -59,13 +67,10 @@ public:
static void applyTransform (const AffineTransform& t);
static void applyMatrix (const float matrixValues[16]);
#if ! JUCE_OPENGL_ES
#if ! JUCE_OPENGL_ES
static void applyMatrix (const double matrixValues[16]);
#endif
#endif
static void enableScissorTest (const Rectangle<int>& clip);
/** Draws a 2D quad with the specified corner points. */
static void drawQuad2D (float x1, float y1,
float x2, float y2,
@@ -79,7 +84,6 @@ public:
float x3, float y3, float z3,
float x4, float y4, float z4,
const Colour& colour);
static void drawTriangleStrip (const GLfloat* const vertices, const GLfloat* const textureCoords, const int numVertices) noexcept;
static void drawTriangleStrip (const GLfloat* const vertices, const GLfloat* const textureCoords,
@@ -89,17 +93,12 @@ public:
static void fillRectWithTexture (const Rectangle<int>& rect, GLuint textureID, const float alpha);
static void fillRect (const Rectangle<int>& rect);
/** Fills a rectangle with the specified colour. */
static void fillRectWithColour (const Rectangle<int>& rect,
const Colour& colour);
/** Checks whether the current context supports the specified extension. */
static bool isExtensionSupported (const char* extensionName);
/** Returns the address of a named GL extension function */
static void* getExtensionFunction (const char* functionName);
static void fillRect (const Rectangle<int>& rect);
#endif
};
//==============================================================================


+ 0
- 57
modules/juce_opengl/opengl/juce_OpenGLRenderingTarget.h View File

@@ -1,57 +0,0 @@
/*
==============================================================================
This file is part of the JUCE library - "Jules' Utility Class Extensions"
Copyright 2004-11 by Raw Material Software Ltd.
------------------------------------------------------------------------------
JUCE can be redistributed and/or modified under the terms of the GNU General
Public License (Version 2), as published by the Free Software Foundation.
A copy of the license is included in the JUCE distribution, or can be found
online at www.gnu.org/licenses.
JUCE is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE. See the GNU General Public License for more details.
------------------------------------------------------------------------------
To release a closed-source product which uses JUCE, commercial licenses are
available: visit www.rawmaterialsoftware.com/juce for more information.
==============================================================================
*/
#ifndef __JUCE_OPENGLRENDERINGTARGET_JUCEHEADER__
#define __JUCE_OPENGLRENDERINGTARGET_JUCEHEADER__
//==============================================================================
/**
Base class for OpenGL objects which can be selected as a rendering target.
*/
class JUCE_API OpenGLRenderingTarget
{
public:
OpenGLRenderingTarget();
virtual ~OpenGLRenderingTarget();
/** Activates this object as the current OpenGL target. */
virtual bool makeCurrentRenderingTarget() = 0;
/** Deactivates this object as the current OpenGL target. */
virtual void releaseAsRenderingTarget() = 0;
/** Returns the width in pixels of this target. */
virtual int getRenderingTargetWidth() const = 0;
/** Returns the height in pixels of this target. */
virtual int getRenderingTargetHeight() const = 0;
/** Sets the current matrix for 2D rendering into this object.
@see OpenGLHelpers::prepareFor2D
*/
void prepareFor2D();
};
#endif // __JUCE_OPENGLRENDERINGTARGET_JUCEHEADER__

Write Preview
Loading…
Cancel
Save