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

Internal graphics refactoring.

Browse source
This commit is contained in:
jules 2011-10-16 17:30:33 +01:00
parent 2ce2d3fe37
commit b258976e6a
11 changed files with 51 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/juce_graphics/contexts/juce_GraphicsContext.cpp
View file

@ -697,7 +697,7 @@ void Graphics::drawImageTransformed (const Image& imageToDraw,
}
else
{
context->drawImage (imageToDraw, transform, false);
context->drawImage (imageToDraw, transform);
}
}
}

2
modules/juce_graphics/contexts/juce_LowLevelGraphicsContext.h
View file

@ -94,7 +94,7 @@ public:
virtual void fillRect (const Rectangle<int>& r, bool replaceExistingContents) = 0;
virtual void fillPath (const Path& path, const AffineTransform& transform) = 0;
virtual void drawImage (const Image& sourceImage, const AffineTransform& transform, bool fillEntireClipAsTiles) = 0;
virtual void drawImage (const Image& sourceImage, const AffineTransform& transform) = 0;
virtual void drawLine (const Line <float>& line) = 0;
virtual void drawVerticalLine (int x, float top, float bottom) = 0;

2
modules/juce_graphics/contexts/juce_LowLevelGraphicsPostScriptRenderer.cpp
View file

@ -464,7 +464,7 @@ void LowLevelGraphicsPostScriptRenderer::writeImage (const Image& im,
out << "\n>}\n";
}
void LowLevelGraphicsPostScriptRenderer::drawImage (const Image& sourceImage, const AffineTransform& transform, const bool /*fillEntireClipAsTiles*/)
void LowLevelGraphicsPostScriptRenderer::drawImage (const Image& sourceImage, const AffineTransform& transform)
{
const int w = sourceImage.getWidth();
const int h = sourceImage.getHeight();

2
modules/juce_graphics/contexts/juce_LowLevelGraphicsPostScriptRenderer.h
View file

@ -77,7 +77,7 @@ public:
void fillRect (const Rectangle<int>& r, bool replaceExistingContents);
void fillPath (const Path& path, const AffineTransform& transform);
void drawImage (const Image& sourceImage, const AffineTransform& transform, bool fillEntireClipAsTiles);
void drawImage (const Image& sourceImage, const AffineTransform& transform);
void drawLine (const Line <float>& line);

6
modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp
View file

@ -1854,7 +1854,7 @@ public:
const ScopedPointer<LowLevelGraphicsContext> g (image.createLowLevelContext());
g->setOpacity (finishedLayerState.transparencyLayerAlpha);
g->drawImage (finishedLayerState.image, AffineTransform::translation ((float) layerBounds.getX(),
(float) layerBounds.getY()), false);
(float) layerBounds.getY()));
}
//==============================================================================
@ -2183,9 +2183,9 @@ void LowLevelGraphicsSoftwareRenderer::fillPath (const Path& path, const AffineT
savedState->fillPath (path, transform);
}
void LowLevelGraphicsSoftwareRenderer::drawImage (const Image& sourceImage, const AffineTransform& transform, const bool fillEntireClipAsTiles)
void LowLevelGraphicsSoftwareRenderer::drawImage (const Image& sourceImage, const AffineTransform& transform)
{
savedState->renderImage (sourceImage, transform, fillEntireClipAsTiles ? savedState->clip : 0);
savedState->renderImage (sourceImage, transform, nullptr);
}
void LowLevelGraphicsSoftwareRenderer::drawLine (const Line <float>& line)

2
modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h
View file

@ -80,7 +80,7 @@ public:
void fillRect (const Rectangle<int>& r, bool replaceExistingContents);
void fillPath (const Path& path, const AffineTransform& transform);
void drawImage (const Image& sourceImage, const AffineTransform& transform, bool fillEntireClipAsTiles);
void drawImage (const Image& sourceImage, const AffineTransform& transform);
void drawLine (const Line <float>& line);

72
modules/juce_graphics/geometry/juce_Path.cpp
View file

@ -26,7 +26,7 @@
BEGIN_JUCE_NAMESPACE
// tests that some co-ords aren't NaNs
#define CHECK_COORDS_ARE_VALID(x, y) \
#define JUCE_CHECK_COORDS_ARE_VALID(x, y) \
jassert (x == x && y == y);
//==============================================================================
@ -168,12 +168,12 @@ void Path::clear() noexcept
void Path::swapWithPath (Path& other) noexcept
{
data.swapWith (other.data);
swapVariables <size_t> (numElements, other.numElements);
swapVariables <float> (pathXMin, other.pathXMin);
swapVariables <float> (pathXMax, other.pathXMax);
swapVariables <float> (pathYMin, other.pathYMin);
swapVariables <float> (pathYMax, other.pathYMax);
swapVariables <bool> (useNonZeroWinding, other.useNonZeroWinding);
std::swap (numElements, other.numElements);
std::swap (pathXMin, other.pathXMin);
std::swap (pathXMax, other.pathXMax);
std::swap (pathYMin, other.pathYMin);
std::swap (pathYMax, other.pathYMax);
std::swap (useNonZeroWinding, other.useNonZeroWinding);
}
//==============================================================================
@ -227,7 +227,7 @@ Rectangle<float> Path::getBoundsTransformed (const AffineTransform& transform) c
//==============================================================================
void Path::startNewSubPath (const float x, const float y)
{
CHECK_COORDS_ARE_VALID (x, y);
JUCE_CHECK_COORDS_ARE_VALID (x, y);
if (numElements == 0)
{
@ -256,7 +256,7 @@ void Path::startNewSubPath (const Point<float>& start)
void Path::lineTo (const float x, const float y)
{
CHECK_COORDS_ARE_VALID (x, y);
JUCE_CHECK_COORDS_ARE_VALID (x, y);
if (numElements == 0)
startNewSubPath (0, 0);
@ -281,8 +281,8 @@ void Path::lineTo (const Point<float>& end)
void Path::quadraticTo (const float x1, const float y1,
const float x2, const float y2)
{
CHECK_COORDS_ARE_VALID (x1, y1);
CHECK_COORDS_ARE_VALID (x2, y2);
JUCE_CHECK_COORDS_ARE_VALID (x1, y1);
JUCE_CHECK_COORDS_ARE_VALID (x2, y2);
if (numElements == 0)
startNewSubPath (0, 0);
@ -312,9 +312,9 @@ void Path::cubicTo (const float x1, const float y1,
const float x2, const float y2,
const float x3, const float y3)
{
CHECK_COORDS_ARE_VALID (x1, y1);
CHECK_COORDS_ARE_VALID (x2, y2);
CHECK_COORDS_ARE_VALID (x3, y3);
JUCE_CHECK_COORDS_ARE_VALID (x1, y1);
JUCE_CHECK_COORDS_ARE_VALID (x2, y2);
JUCE_CHECK_COORDS_ARE_VALID (x3, y3);
if (numElements == 0)
startNewSubPath (0, 0);
@ -383,11 +383,8 @@ void Path::addRectangle (const float x, const float y,
{
float x1 = x, y1 = y, x2 = x + w, y2 = y + h;
if (w < 0)
swapVariables (x1, x2);
if (h < 0)
swapVariables (y1, y2);
if (w < 0) std::swap (x1, x2);
if (h < 0) std::swap (y1, y2);
data.ensureAllocatedSize ((int) numElements + 13);
@ -962,29 +959,25 @@ AffineTransform Path::getTransformToScaleToFit (const float x, const float y,
float newXCentre = x;
float newYCentre = y;
if (justification.testFlags (Justification::left))
newXCentre += newW * 0.5f;
else if (justification.testFlags (Justification::right))
newXCentre += w - newW * 0.5f;
else
newXCentre += w * 0.5f;
if (justification.testFlags (Justification::left)) newXCentre += newW * 0.5f;
else if (justification.testFlags (Justification::right)) newXCentre += w - newW * 0.5f;
else newXCentre += w * 0.5f;
if (justification.testFlags (Justification::top))
newYCentre += newH * 0.5f;
else if (justification.testFlags (Justification::bottom))
newYCentre += h - newH * 0.5f;
else
newYCentre += h * 0.5f;
if (justification.testFlags (Justification::top)) newYCentre += newH * 0.5f;
else if (justification.testFlags (Justification::bottom)) newYCentre += h - newH * 0.5f;
else newYCentre += h * 0.5f;
return AffineTransform::translation (bounds.getWidth() * -0.5f - bounds.getX(),
return AffineTransform::translation (bounds.getWidth() * -0.5f - bounds.getX(),
bounds.getHeight() * -0.5f - bounds.getY())
.scaled (newW / bounds.getWidth(), newH / bounds.getHeight())
.scaled (newW / bounds.getWidth(),
newH / bounds.getHeight())
.translated (newXCentre, newYCentre);
}
else
{
return AffineTransform::translation (-bounds.getX(), -bounds.getY())
.scaled (w / bounds.getWidth(), h / bounds.getHeight())
.scaled (w / bounds.getWidth(),
h / bounds.getHeight())
.translated (x, y);
}
}
@ -1042,7 +1035,7 @@ Line<float> Path::getClippedLine (const Line<float>& line, const bool keepSectio
{
Line<float> result (line);
const bool startInside = contains (line.getStart());
const bool endInside = contains (line.getEnd());
const bool endInside = contains (line.getEnd());
if (startInside == endInside)
{
@ -1162,8 +1155,8 @@ Path Path::createPathWithRoundedCorners (const float cornerRadius) const
{
startX = data.elements [n - 8];
startY = data.elements [n - 7];
joinX = data.elements [n - 5];
joinY = data.elements [n - 4];
joinX = data.elements [n - 5];
joinY = data.elements [n - 4];
}
}
else
@ -1175,8 +1168,8 @@ Path Path::createPathWithRoundedCorners (const float cornerRadius) const
{
startX = data.elements [n - 6];
startY = data.elements [n - 5];
joinX = data.elements [n - 3];
joinY = data.elements [n - 2];
joinX = data.elements [n - 3];
joinY = data.elements [n - 2];
}
}
@ -1592,5 +1585,6 @@ bool Path::Iterator::next()
return false;
}
#undef JUCE_CHECK_COORDS_ARE_VALID
END_JUCE_NAMESPACE

4
modules/juce_graphics/native/juce_android_GraphicsContext.cpp
View file

@ -450,7 +450,7 @@ public:
getCurrentPaint());
}
void drawImage (const Image& sourceImage, const AffineTransform& transform, bool fillEntireClipAsTiles)
void drawImage (const Image& sourceImage, const AffineTransform& transform)
{
AndroidImage* androidImage = dynamic_cast <AndroidImage*> (sourceImage.getSharedImage());
@ -502,7 +502,7 @@ public:
{
saveState();
addTransform (transform);
drawImage (sourceImage, AffineTransform::identity, fillEntireClipAsTiles);
drawImage (sourceImage, AffineTransform::identity);
restoreState();
}
}

3
modules/juce_graphics/native/juce_mac_CoreGraphicsContext.h
View file

@ -63,7 +63,7 @@ public:
void fillRect (const Rectangle<int>& r, const bool replaceExistingContents);
void fillCGRect (const CGRect& cgRect, const bool replaceExistingContents);
void fillPath (const Path& path, const AffineTransform& transform);
void drawImage (const Image& sourceImage, const AffineTransform& transform, const bool fillEntireClipAsTiles);
void drawImage (const Image& sourceImage, const AffineTransform& transform);
//==============================================================================
void drawLine (const Line<float>& line);
@ -111,6 +111,7 @@ private:
void createPath (const Path& path, const AffineTransform& transform) const;
void flip() const;
void applyTransform (const AffineTransform& transform) const;
void drawImage (const Image& sourceImage, const AffineTransform& transform, bool fillEntireClipAsTiles);
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CoreGraphicsContext);
};

5
modules/juce_graphics/native/juce_mac_CoreGraphicsContext.mm
View file

@ -436,6 +436,11 @@ void CoreGraphicsContext::fillPath (const Path& path, const AffineTransform& tra
CGContextRestoreGState (context);
}
void CoreGraphicsContext::drawImage (const Image& sourceImage, const AffineTransform& transform)
{
drawImage (sourceImage, transform, false);
}
void CoreGraphicsContext::drawImage (const Image& sourceImage, const AffineTransform& transform, const bool fillEntireClipAsTiles)
{
const int iw = sourceImage.getWidth();

2
modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.cpp
View file

@ -223,7 +223,7 @@ public:
renderingTarget->FillGeometry (geometry, currentState->currentBrush);
}
void drawImage (const Image& image, const AffineTransform& transform, bool fillEntireClipAsTiles)
void drawImage (const Image& image, const AffineTransform& transform)
{
const int x = currentState->origin.getX();
const int y = currentState->origin.getY();