fix macOS build (following Projucer changes made in Windows, which removed /Applications/JUCE/modules from its headers). move JUCE headers under source control, so that Windows and macOS can both build against same version of JUCE. remove AUv3 target (I think it's an iOS thing, so it will never work with this macOS fluidsynth dylib).
This commit is contained in:
Alex Birch
112
modules/juce_box2d/utils/juce_Box2DRenderer.cpp
Normal file
112
modules/juce_box2d/utils/juce_Box2DRenderer.cpp
Normal file
@ -0,0 +1,112 @@
|
||||
/*
|
||||
==============================================================================
|
||||
|
||||
This file is part of the JUCE library.
|
||||
Copyright (c) 2017 - ROLI Ltd.
|
||||
|
||||
JUCE is an open source library subject to commercial or open-source
|
||||
licensing.
|
||||
|
||||
By using JUCE, you agree to the terms of both the JUCE 5 End-User License
|
||||
Agreement and JUCE 5 Privacy Policy (both updated and effective as of the
|
||||
27th April 2017).
|
||||
|
||||
End User License Agreement: www.juce.com/juce-5-licence
|
||||
Privacy Policy: www.juce.com/juce-5-privacy-policy
|
||||
|
||||
Or: You may also use this code under the terms of the GPL v3 (see
|
||||
www.gnu.org/licenses).
|
||||
|
||||
JUCE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL WARRANTIES, WHETHER
|
||||
EXPRESSED OR IMPLIED, INCLUDING MERCHANTABILITY AND FITNESS FOR PURPOSE, ARE
|
||||
DISCLAIMED.
|
||||
|
||||
==============================================================================
|
||||
*/
|
||||
|
||||
namespace juce
|
||||
{
|
||||
|
||||
Box2DRenderer::Box2DRenderer() noexcept : graphics (nullptr)
|
||||
{
|
||||
SetFlags (e_shapeBit);
|
||||
}
|
||||
|
||||
void Box2DRenderer::render (Graphics& g, b2World& world,
|
||||
float left, float top, float right, float bottom,
|
||||
const Rectangle<float>& target)
|
||||
{
|
||||
graphics = &g;
|
||||
|
||||
g.addTransform (AffineTransform::fromTargetPoints (left, top, target.getX(), target.getY(),
|
||||
right, top, target.getRight(), target.getY(),
|
||||
left, bottom, target.getX(), target.getBottom()));
|
||||
|
||||
world.SetDebugDraw (this);
|
||||
world.DrawDebugData();
|
||||
}
|
||||
|
||||
Colour Box2DRenderer::getColour (const b2Color& c) const
|
||||
{
|
||||
return Colour::fromFloatRGBA (c.r, c.g, c.b, 1.0f);
|
||||
}
|
||||
|
||||
float Box2DRenderer::getLineThickness() const
|
||||
{
|
||||
return 0.1f;
|
||||
}
|
||||
|
||||
static void createPath (Path& p, const b2Vec2* vertices, int32 vertexCount)
|
||||
{
|
||||
p.startNewSubPath (vertices[0].x, vertices[0].y);
|
||||
|
||||
for (int i = 1; i < vertexCount; ++i)
|
||||
p.lineTo (vertices[i].x, vertices[i].y);
|
||||
|
||||
p.closeSubPath();
|
||||
}
|
||||
|
||||
void Box2DRenderer::DrawPolygon (const b2Vec2* vertices, int32 vertexCount, const b2Color& color)
|
||||
{
|
||||
graphics->setColour (getColour (color));
|
||||
|
||||
Path p;
|
||||
createPath (p, vertices, vertexCount);
|
||||
graphics->strokePath (p, PathStrokeType (getLineThickness()));
|
||||
}
|
||||
|
||||
void Box2DRenderer::DrawSolidPolygon (const b2Vec2* vertices, int32 vertexCount, const b2Color& color)
|
||||
{
|
||||
graphics->setColour (getColour (color));
|
||||
|
||||
Path p;
|
||||
createPath (p, vertices, vertexCount);
|
||||
graphics->fillPath (p);
|
||||
}
|
||||
|
||||
void Box2DRenderer::DrawCircle (const b2Vec2& center, float32 radius, const b2Color& color)
|
||||
{
|
||||
graphics->setColour (getColour (color));
|
||||
graphics->drawEllipse (center.x - radius, center.y - radius,
|
||||
radius * 2.0f, radius * 2.0f,
|
||||
getLineThickness());
|
||||
}
|
||||
|
||||
void Box2DRenderer::DrawSolidCircle (const b2Vec2& center, float32 radius, const b2Vec2& /*axis*/, const b2Color& colour)
|
||||
{
|
||||
graphics->setColour (getColour (colour));
|
||||
graphics->fillEllipse (center.x - radius, center.y - radius,
|
||||
radius * 2.0f, radius * 2.0f);
|
||||
}
|
||||
|
||||
void Box2DRenderer::DrawSegment (const b2Vec2& p1, const b2Vec2& p2, const b2Color& color)
|
||||
{
|
||||
graphics->setColour (getColour (color));
|
||||
graphics->drawLine (p1.x, p1.y, p2.x, p2.y, getLineThickness());
|
||||
}
|
||||
|
||||
void Box2DRenderer::DrawTransform (const b2Transform&)
|
||||
{
|
||||
}
|
||||
|
||||
} // namespace juce
|
||||
80
modules/juce_box2d/utils/juce_Box2DRenderer.h
Normal file
80
modules/juce_box2d/utils/juce_Box2DRenderer.h
Normal file
@ -0,0 +1,80 @@
|
||||
/*
|
||||
==============================================================================
|
||||
|
||||
This file is part of the JUCE library.
|
||||
Copyright (c) 2017 - ROLI Ltd.
|
||||
|
||||
JUCE is an open source library subject to commercial or open-source
|
||||
licensing.
|
||||
|
||||
By using JUCE, you agree to the terms of both the JUCE 5 End-User License
|
||||
Agreement and JUCE 5 Privacy Policy (both updated and effective as of the
|
||||
27th April 2017).
|
||||
|
||||
End User License Agreement: www.juce.com/juce-5-licence
|
||||
Privacy Policy: www.juce.com/juce-5-privacy-policy
|
||||
|
||||
Or: You may also use this code under the terms of the GPL v3 (see
|
||||
www.gnu.org/licenses).
|
||||
|
||||
JUCE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL WARRANTIES, WHETHER
|
||||
EXPRESSED OR IMPLIED, INCLUDING MERCHANTABILITY AND FITNESS FOR PURPOSE, ARE
|
||||
DISCLAIMED.
|
||||
|
||||
==============================================================================
|
||||
*/
|
||||
|
||||
namespace juce
|
||||
{
|
||||
|
||||
//==============================================================================
|
||||
/** A simple implementation of the b2Draw class, used to draw a Box2D world.
|
||||
|
||||
To use it, simply create an instance of this class in your paint() method,
|
||||
and call its render() method.
|
||||
|
||||
@tags{Box2D}
|
||||
*/
|
||||
class Box2DRenderer : public b2Draw
|
||||
|
||||
{
|
||||
public:
|
||||
Box2DRenderer() noexcept;
|
||||
|
||||
/** Renders the world.
|
||||
|
||||
@param g the context to render into
|
||||
@param world the world to render
|
||||
@param box2DWorldLeft the left coordinate of the area of the world to be drawn
|
||||
@param box2DWorldTop the top coordinate of the area of the world to be drawn
|
||||
@param box2DWorldRight the right coordinate of the area of the world to be drawn
|
||||
@param box2DWorldBottom the bottom coordinate of the area of the world to be drawn
|
||||
@param targetArea the area within the target context onto which the source
|
||||
world rectangle should be mapped
|
||||
*/
|
||||
void render (Graphics& g,
|
||||
b2World& world,
|
||||
float box2DWorldLeft, float box2DWorldTop,
|
||||
float box2DWorldRight, float box2DWorldBottom,
|
||||
const Rectangle<float>& targetArea);
|
||||
|
||||
// b2Draw methods:
|
||||
void DrawPolygon (const b2Vec2*, int32, const b2Color&) override;
|
||||
void DrawSolidPolygon (const b2Vec2*, int32, const b2Color&) override;
|
||||
void DrawCircle (const b2Vec2& center, float32 radius, const b2Color&) override;
|
||||
void DrawSolidCircle (const b2Vec2& center, float32 radius, const b2Vec2& axis, const b2Color&) override;
|
||||
void DrawSegment (const b2Vec2& p1, const b2Vec2& p2, const b2Color&) override;
|
||||
void DrawTransform (const b2Transform& xf) override;
|
||||
|
||||
/** Converts a b2Color to a juce Colour. */
|
||||
virtual Colour getColour (const b2Color&) const;
|
||||
/** Returns the thickness to use for drawing outlines. */
|
||||
virtual float getLineThickness() const;
|
||||
|
||||
protected:
|
||||
Graphics* graphics;
|
||||
|
||||
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (Box2DRenderer)
|
||||
};
|
||||
|
||||
} // namespace juce
|
||||
Reference in New Issue
Block a user