Skip to content
Snippets Groups Projects
Commit 4807fea3 authored by Andrew Heather's avatar Andrew Heather
Browse files
parents 7908be9e a67cfa01
No related branches found
No related tags found
No related merge requests found
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
*.la *.la
*.so *.so
*.jar *.jar
lex.yy.c
# Corefiles # Corefiles
core core
...@@ -27,10 +28,13 @@ core ...@@ -27,10 +28,13 @@ core
lnInclude lnInclude
# linux build folder(s) - anywhere # linux build folder(s) - anywhere
linux*Gcc*[SD]POpt* linux*Gcc*
# reinstate wmake/rules that look like build folders # reinstate wmake/rules that look like build folders
!wmake/rules/linux* !wmake/rules/linux*
# but do ignore the derived files in there
wmake/rules/linux*/dirToString
wmake/rules/linux*/wmkdep
# doxygen generated documentation # doxygen generated documentation
doc/[Dd]oxygen/html doc/[Dd]oxygen/html
......
...@@ -27,8 +27,6 @@ License ...@@ -27,8 +27,6 @@ License
#include "treeBoundBox.H" #include "treeBoundBox.H"
#include "ListOps.H" #include "ListOps.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
const Foam::treeBoundBox Foam::treeBoundBox::greatBox const Foam::treeBoundBox Foam::treeBoundBox::greatBox
...@@ -50,6 +48,7 @@ const Foam::label facesArray[6][4] = ...@@ -50,6 +48,7 @@ const Foam::label facesArray[6][4] =
}; };
//! @endcond //! @endcond
const Foam::faceList Foam::treeBoundBox::faces const Foam::faceList Foam::treeBoundBox::faces
( (
initListList<face, label, 6, 4>(facesArray) initListList<face, label, 6, 4>(facesArray)
...@@ -74,12 +73,28 @@ const Foam::label edgesArray[12][2] = ...@@ -74,12 +73,28 @@ const Foam::label edgesArray[12][2] =
}; };
//! @endcond //! @endcond
const Foam::edgeList Foam::treeBoundBox::edges
const Foam::FixedList<Foam::vector, 6> Foam::treeBoundBox::faceNormals
( (
initListList<edge, label, 12, 2>(edgesArray) calcFaceNormals()
); );
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
Foam::FixedList<Foam::vector, 6> Foam::treeBoundBox::calcFaceNormals()
{
FixedList<vector, 6> normals;
normals[LEFT] = vector(-1, 0, 0);
normals[RIGHT] = vector( 1, 0, 0);
normals[BOTTOM] = vector( 0, -1, 0);
normals[TOP] = vector( 0, 1, 0);
normals[BACK] = vector( 0, 0, -1);
normals[FRONT] = vector( 0, 0, 1);
return normals;
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct as the bounding box of the given pointField // Construct as the bounding box of the given pointField
......
...@@ -78,6 +78,11 @@ class treeBoundBox ...@@ -78,6 +78,11 @@ class treeBoundBox
public boundBox public boundBox
{ {
private:
//- To initialise faceNormals.
static FixedList<vector, 6> calcFaceNormals();
public: public:
// Static data members // Static data members
...@@ -142,6 +147,9 @@ public: ...@@ -142,6 +147,9 @@ public:
//- Edge to point addressing //- Edge to point addressing
static const edgeList edges; static const edgeList edges;
//- Per face the unit normal
static const FixedList<vector, 6> faceNormals;
//- Face on which neighbour is //- Face on which neighbour is
static direction neighbourFaceBits(const label&); static direction neighbourFaceBits(const label&);
......
File deleted
File deleted
This diff is collapsed.
...@@ -56,7 +56,7 @@ void importDirectory(const char* dirName); ...@@ -56,7 +56,7 @@ void importDirectory(const char* dirName);
%} %}
%s CMNT CFNAME SCFNAME JFNAME FFNAME %x CMNT CFNAME SCFNAME JFNAME FFNAME
%% %%
"//".*\n ; /* remove c++ style one line comments */ "//".*\n ; /* remove c++ style one line comments */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment