Fixed (hacked!) const problems under Linux.
This commit is contained in:
@ -38,28 +38,28 @@ namespace Ogre
|
||||
|
||||
bool isDegenerate(void);
|
||||
|
||||
const SurfaceVertexIterator& getTarget(void);
|
||||
const SurfaceVertexIterator& getSource(void);
|
||||
const SurfaceEdgeIterator& getOtherHalfEdge(void);
|
||||
const SurfaceEdgeIterator& getPreviousHalfEdge(void);
|
||||
const SurfaceEdgeIterator& getNextHalfEdge(void);
|
||||
const SurfaceTriangleIterator& getTriangle(void);
|
||||
const SurfaceVertexIterator& getTarget(void) const;
|
||||
const SurfaceVertexIterator& getSource(void) const;
|
||||
const SurfaceEdgeIterator& getOtherHalfEdge(void) const;
|
||||
const SurfaceEdgeIterator& getPreviousHalfEdge(void) const;
|
||||
const SurfaceEdgeIterator& getNextHalfEdge(void) const;
|
||||
const SurfaceTriangleIterator& getTriangle(void) const;
|
||||
|
||||
void setPreviousHalfEdge(const SurfaceEdgeIterator& previousHalfEdgeToSet);
|
||||
void setNextHalfEdge(const SurfaceEdgeIterator& nextHalfEdgeToSet);
|
||||
void setTriangle(const SurfaceTriangleIterator& triangleToSet);
|
||||
void setPreviousHalfEdge(const SurfaceEdgeIterator& previousHalfEdgeToSet) const;
|
||||
void setNextHalfEdge(const SurfaceEdgeIterator& nextHalfEdgeToSet) const;
|
||||
void setTriangle(const SurfaceTriangleIterator& triangleToSet) const;
|
||||
|
||||
void pairWithOtherHalfEdge(const SurfaceEdgeIterator& otherHalfEdgeToPair);
|
||||
void pairWithOtherHalfEdge(const SurfaceEdgeIterator& otherHalfEdgeToPair) const;
|
||||
|
||||
private:
|
||||
SurfaceVertexIterator target;
|
||||
SurfaceVertexIterator source;
|
||||
|
||||
SurfaceEdgeIterator previousHalfEdge;
|
||||
SurfaceEdgeIterator nextHalfEdge;
|
||||
SurfaceEdgeIterator otherHalfEdge;
|
||||
mutable SurfaceEdgeIterator previousHalfEdge;
|
||||
mutable SurfaceEdgeIterator nextHalfEdge;
|
||||
mutable SurfaceEdgeIterator otherHalfEdge;
|
||||
|
||||
SurfaceTriangleIterator triangle;
|
||||
mutable SurfaceTriangleIterator triangle;
|
||||
};
|
||||
}
|
||||
|
||||
|
@ -14,4 +14,4 @@ namespace Ogre
|
||||
typedef std::set<SurfaceEdge>::const_iterator SurfaceEdgeConstIterator;
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
@ -44,17 +44,17 @@ namespace Ogre
|
||||
const UIntVector3& getPosition(void) const;
|
||||
|
||||
void setAlpha(float alphaToSet);
|
||||
void setEdge(const SurfaceEdgeIterator& edgeToSet);
|
||||
void setNormal(const Vector3& normalToSet);
|
||||
void setEdge(const SurfaceEdgeIterator& edgeToSet) const;
|
||||
void setNormal(const Vector3& normalToSet) const;
|
||||
|
||||
std::string toString(void);
|
||||
std::string toString(void) const;
|
||||
|
||||
private:
|
||||
UIntVector3 position;
|
||||
Vector3 normal;
|
||||
mutable Vector3 normal;
|
||||
float alpha;
|
||||
|
||||
SurfaceEdgeIterator edge;
|
||||
mutable SurfaceEdgeIterator edge;
|
||||
|
||||
unsigned long m_uHash;
|
||||
};
|
||||
|
Reference in New Issue
Block a user