Bug 684759 - Part 2 - Add DirectedGraph and gfxQuad classes. r=roc

This commit is contained in:
Matt Woodrow 2011-10-07 10:22:18 +13:00
Родитель 94dd044d81
Коммит c45a16d1df
5 изменённых файлов: 256 добавлений и 0 удалений

148
gfx/layers/DirectedGraph.h Normal file
Просмотреть файл

@ -0,0 +1,148 @@
/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Mozilla Corporation code.
*
* The Initial Developer of the Original Code is Mozilla Foundation.
* Portions created by the Initial Developer are Copyright (C) 2011
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Matt Woodrow <mwoodrow@mozilla.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#ifndef GFX_DIRECTEDGRAPH_H
#define GFX_DIRECTEDGRAPH_H
#include "gfxTypes.h"
#include "nsTArray.h"
namespace mozilla {
namespace layers {
template <typename T>
class DirectedGraph {
public:
class Edge {
public:
Edge(T aFrom, T aTo) : mFrom(aFrom), mTo(aTo) {}
bool operator==(const Edge& aOther) const
{
return mFrom == aOther.mFrom && mTo == aOther.mTo;
}
T mFrom;
T mTo;
};
class RemoveEdgesToComparator
{
public:
PRBool Equals(const Edge& a, T const& b) const { return a.mTo == b; }
};
/**
* Add a new edge to the graph.
*/
void AddEdge(Edge aEdge)
{
NS_ASSERTION(!mEdges.Contains(aEdge), "Adding a duplicate edge!");
mEdges.AppendElement(aEdge);
}
void AddEdge(T aFrom, T aTo)
{
AddEdge(Edge(aFrom, aTo));
}
/**
* Get the list of edges.
*/
const nsTArray<Edge>& GetEdgeList() const
{
return mEdges;
}
/**
* Remove the given edge from the graph.
*/
void RemoveEdge(Edge aEdge)
{
mEdges.RemoveElement(aEdge);
}
/**
* Remove all edges going into aNode.
*/
void RemoveEdgesTo(T aNode)
{
RemoveEdgesToComparator c;
while (mEdges.RemoveElement(aNode, c)) {}
}
/**
* Get the number of edges going into aNode.
*/
unsigned int NumEdgesTo(T aNode)
{
unsigned int count = 0;
for (unsigned int i = 0; i < mEdges.Length(); i++) {
if (mEdges.ElementAt(i).mTo == aNode) {
count++;
}
}
return count;
}
/**
* Get the list of all edges going from aNode
*/
void GetEdgesFrom(T aNode, nsTArray<Edge>& aResult)
{
for (unsigned int i = 0; i < mEdges.Length(); i++) {
if (mEdges.ElementAt(i).mFrom == aNode) {
aResult.AppendElement(mEdges.ElementAt(i));
}
}
}
/**
* Get the total number of edges.
*/
unsigned int GetEdgeCount() { return mEdges.Length(); }
private:
nsTArray<Edge> mEdges;
};
}
}
#endif // GFX_DIRECTEDGRAPH_H

Просмотреть файл

@ -34,6 +34,7 @@ EXPORTS = \
gfxPoint.h \
gfxPoint3D.h \
gfxPointH3D.h \
gfxQuad.h \
gfxQuaternion.h \
gfxRect.h \
gfxSkipChars.h \

Просмотреть файл

@ -667,6 +667,22 @@ gfx3DMatrix::TransformBounds(const gfxRect& rect) const
return gfxRect(min_x, min_y, max_x - min_x, max_y - min_y);
}
gfxQuad
gfx3DMatrix::TransformRect(const gfxRect& aRect) const
{
gfxPoint points[4];
points[0] = Transform(aRect.TopLeft());
points[1] = Transform(gfxPoint(aRect.X() + aRect.Width(), aRect.Y()));
points[2] = Transform(gfxPoint(aRect.X() + aRect.Width(),
aRect.Y() + aRect.Height()));
points[3] = Transform(gfxPoint(aRect.X(), aRect.Y() + aRect.Height()));
// Could this ever result in lines that intersect? I don't think so.
return gfxQuad(points[0], points[1], points[2], points[3]);
}
bool
gfx3DMatrix::Is2D() const
{

Просмотреть файл

@ -43,6 +43,7 @@
#include <gfxPoint3D.h>
#include <gfxPointH3D.h>
#include <gfxMatrix.h>
#include <gfxQuad.h>
/**
* This class represents a 3D transformation. The matrix is laid
@ -247,6 +248,9 @@ public:
*/
gfxRect TransformBounds(const gfxRect& rect) const;
gfxQuad TransformRect(const gfxRect& aRect) const;
/**
* Transforms a 3D vector according to this matrix.
*/

87
gfx/thebes/gfxQuad.h Normal file
Просмотреть файл

@ -0,0 +1,87 @@
/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Mozilla Corporation code.
*
* The Initial Developer of the Original Code is Oracle Corporation.
* Portions created by the Initial Developer are Copyright (C) 2005
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Matt Woodrow <mwoodrow@mozilla.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#ifndef GFX_QUAD_H
#define GFX_QUAD_H
#include "nsMathUtils.h"
#include "mozilla/gfx/BaseSize.h"
#include "mozilla/gfx/BasePoint.h"
#include "nsSize.h"
#include "nsPoint.h"
#include "gfxTypes.h"
static PRBool SameSideOfLine(const gfxPoint& aPoint1, const gfxPoint& aPoint2, const gfxPoint& aTest, const gfxPoint& aRef)
{
// Solve the equation y - aPoint1.y - ((aPoint2.y - aPoint1.y)/(aPoint2.x - aPoint1.x))(x - aPoint1.x) for both test and ref
gfxFloat deltaY = (aPoint2.y - aPoint1.y);
gfxFloat deltaX = (aPoint2.x - aPoint1.x);
gfxFloat test = deltaX * (aTest.y - aPoint1.y) - deltaY * (aTest.x - aPoint1.x);
gfxFloat ref = deltaX * (aRef.y - aPoint1.y) - deltaY * (aRef.x - aPoint1.x);
// If both results have the same sign, then we're on the correct side of the line.
// 0 (on the line) is always considered in.
if ((test >= 0 && ref >= 0) || (test <= 0 && ref <= 0))
return PR_TRUE;
return PR_FALSE;
}
struct THEBES_API gfxQuad {
gfxQuad(const gfxPoint& aOne, const gfxPoint& aTwo, const gfxPoint& aThree, const gfxPoint& aFour)
{
mPoints[0] = aOne;
mPoints[1] = aTwo;
mPoints[2] = aThree;
mPoints[3] = aFour;
}
PRBool Contains(const gfxPoint& aPoint)
{
return (SameSideOfLine(mPoints[0], mPoints[1], aPoint, mPoints[2]) &&
SameSideOfLine(mPoints[1], mPoints[2], aPoint, mPoints[3]) &&
SameSideOfLine(mPoints[2], mPoints[3], aPoint, mPoints[0]) &&
SameSideOfLine(mPoints[3], mPoints[0], aPoint, mPoints[1]));
}
gfxPoint mPoints[4];
};
#endif /* GFX_QUAD_H */