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

Renderer optimisations.

Browse source
This commit is contained in:
jules 2012-11-25 19:04:05 +00:00
parent f292238b32
commit 68476aded8
2 changed files with 71 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

107
modules/juce_graphics/native/juce_RenderingHelpers.h
View file

@ -2153,6 +2153,11 @@ public:
cloneClipIfMultiplyReferenced();
clip = clip->clipToRectangle (transform.translated (r));
}
else if (transform.isIntegerScaling)
{
cloneClipIfMultiplyReferenced();
clip = clip->clipToRectangle (transform.transformed (r).getSmallestIntegerContainer());
}
else
{
Path p;
@ -2175,6 +2180,16 @@ public:
offsetList.offsetAll (transform.xOffset, transform.yOffset);
clip = clip->clipToRectangleList (offsetList);
}
else if (transform.isIntegerScaling)
{
cloneClipIfMultiplyReferenced();
RectangleList scaledList;
for (const Rectangle<int>* i = r.begin(), * const e = r.end(); i != e; ++i)
scaledList.add (transform.transformed (*i).getSmallestIntegerContainer());
clip = clip->clipToRectangleList (scaledList);
}
else
{
clipToPath (r.toPath(), AffineTransform::identity);
@ -2194,6 +2209,10 @@ public:
{
clip = clip->excludeClipRectangle (transform.translated (r));
}
else if (transform.isIntegerScaling)
{
clip = clip->excludeClipRectangle (transform.transformed (r).getSmallestIntegerContainer());
}
else
{
Path p;
@ -2288,32 +2307,56 @@ public:
}
//==============================================================================
void fillTargetRect (const Rectangle<int>& r, const bool replaceContents)
{
if (fillType.isColour())
{
Image::BitmapData destData (image, Image::BitmapData::readWrite);
clip->fillRectWithColour (destData, r, fillType.colour.getPixelARGB(), replaceContents);
}
else
{
const Rectangle<int> clipped (clip->getClipBounds().getIntersection (r));
if (! clipped.isEmpty())
fillShape (new ClipRegions::RectangleListRegion (clipped), false);
}
}
void fillTargetRect (const Rectangle<float>& r)
{
if (fillType.isColour())
{
Image::BitmapData destData (image, Image::BitmapData::readWrite);
clip->fillRectWithColour (destData, r, fillType.colour.getPixelARGB());
}
else
{
const Rectangle<float> clipped (clip->getClipBounds().toFloat().getIntersection (r));
if (! clipped.isEmpty())
fillShape (new ClipRegions::EdgeTableRegion (clipped), false);
}
}
template <typename CoordType>
void fillRectAsPath (const Rectangle<CoordType>& r)
{
Path p;
p.addRectangle (r);
fillPath (p, AffineTransform::identity);
}
void fillRect (const Rectangle<int>& r, const bool replaceContents)
{
if (clip != nullptr)
{
if (transform.isOnlyTranslated)
{
if (fillType.isColour())
{
Image::BitmapData destData (image, Image::BitmapData::readWrite);
clip->fillRectWithColour (destData, transform.translated (r), fillType.colour.getPixelARGB(), replaceContents);
}
else
{
const Rectangle<int> totalClip (clip->getClipBounds());
const Rectangle<int> clipped (totalClip.getIntersection (transform.translated (r)));
if (! clipped.isEmpty())
fillShape (new ClipRegions::RectangleListRegion (clipped), false);
}
}
fillTargetRect (transform.translated (r), replaceContents);
else if (transform.isIntegerScaling)
fillTargetRect (transform.transformed (r).getSmallestIntegerContainer(), replaceContents);
else
{
Path p;
p.addRectangle (r);
fillPath (p, AffineTransform::identity);
}
fillRectAsPath (r);
}
}
@ -2322,27 +2365,11 @@ public:
if (clip != nullptr)
{
if (transform.isOnlyTranslated)
{
if (fillType.isColour())
{
Image::BitmapData destData (image, Image::BitmapData::readWrite);
clip->fillRectWithColour (destData, transform.translated (r), fillType.colour.getPixelARGB());
}
else
{
const Rectangle<float> totalClip (clip->getClipBounds().toFloat());
const Rectangle<float> clipped (totalClip.getIntersection (transform.translated (r)));
if (! clipped.isEmpty())
fillShape (new ClipRegions::EdgeTableRegion (clipped), false);
}
}
fillTargetRect (transform.translated (r));
else if (transform.isIntegerScaling)
fillTargetRect (transform.transformed (r));
else
{
Path p;
p.addRectangle (r);
fillPath (p, AffineTransform::identity);
}
fillRectAsPath (r);
}
}

4
modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.cpp
View file

@ -1889,6 +1889,10 @@ public:
{
clip = clip->excludeClipRectangle (transform.translated (r));
}
else if (transform.isIntegerScaling)
{
clip = clip->excludeClipRectangle (transform.transformed (r).getSmallestIntegerContainer());
}
else
{
Path p;