AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

Fixed (hacked!) const problems under Linux.

Browse Source
This commit is contained in:
David Williams 2007-10-04 13:41:24 +00:00
parent 5c747c2ff1
commit 6cafc64e24
5 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/SurfaceEdge.h
View File

@ -38,28 +38,28 @@ namespace Ogre
bool isDegenerate(void); bool isDegenerate(void);
const SurfaceVertexIterator& getTarget(void); const SurfaceVertexIterator& getTarget(void) const;
const SurfaceVertexIterator& getSource(void); const SurfaceVertexIterator& getSource(void) const;
const SurfaceEdgeIterator& getOtherHalfEdge(void); const SurfaceEdgeIterator& getOtherHalfEdge(void) const;
const SurfaceEdgeIterator& getPreviousHalfEdge(void); const SurfaceEdgeIterator& getPreviousHalfEdge(void) const;
const SurfaceEdgeIterator& getNextHalfEdge(void); const SurfaceEdgeIterator& getNextHalfEdge(void) const;
const SurfaceTriangleIterator& getTriangle(void); const SurfaceTriangleIterator& getTriangle(void) const;
void setPreviousHalfEdge(const SurfaceEdgeIterator& previousHalfEdgeToSet); void setPreviousHalfEdge(const SurfaceEdgeIterator& previousHalfEdgeToSet) const;
void setNextHalfEdge(const SurfaceEdgeIterator& nextHalfEdgeToSet); void setNextHalfEdge(const SurfaceEdgeIterator& nextHalfEdgeToSet) const;
void setTriangle(const SurfaceTriangleIterator& triangleToSet); void setTriangle(const SurfaceTriangleIterator& triangleToSet) const;
void pairWithOtherHalfEdge(const SurfaceEdgeIterator& otherHalfEdgeToPair); void pairWithOtherHalfEdge(const SurfaceEdgeIterator& otherHalfEdgeToPair) const;
private: private:
SurfaceVertexIterator target; SurfaceVertexIterator target;
SurfaceVertexIterator source; SurfaceVertexIterator source;
SurfaceEdgeIterator previousHalfEdge; mutable SurfaceEdgeIterator previousHalfEdge;
SurfaceEdgeIterator nextHalfEdge; mutable SurfaceEdgeIterator nextHalfEdge;
SurfaceEdgeIterator otherHalfEdge; mutable SurfaceEdgeIterator otherHalfEdge;
SurfaceTriangleIterator triangle; mutable SurfaceTriangleIterator triangle;
}; };
} }

2
include/SurfaceTypes.h
View File

@ -14,4 +14,4 @@ namespace Ogre
typedef std::set<SurfaceEdge>::const_iterator SurfaceEdgeConstIterator; typedef std::set<SurfaceEdge>::const_iterator SurfaceEdgeConstIterator;
} }
#endif #endif

10
include/SurfaceVertex.h
View File

@ -44,17 +44,17 @@ namespace Ogre
const UIntVector3& getPosition(void) const; const UIntVector3& getPosition(void) const;
void setAlpha(float alphaToSet); void setAlpha(float alphaToSet);
void setEdge(const SurfaceEdgeIterator& edgeToSet); void setEdge(const SurfaceEdgeIterator& edgeToSet) const;
void setNormal(const Vector3& normalToSet); void setNormal(const Vector3& normalToSet) const;
std::string toString(void); std::string toString(void) const;
private: private:
UIntVector3 position; UIntVector3 position;
Vector3 normal; mutable Vector3 normal;
float alpha; float alpha;
SurfaceEdgeIterator edge; mutable SurfaceEdgeIterator edge;
unsigned long m_uHash; unsigned long m_uHash;
}; };

20
source/SurfaceEdge.cpp
View File

@ -50,54 +50,54 @@ namespace Ogre
return false; return false;
} }
const SurfaceVertexIterator& SurfaceEdge::getTarget(void) const SurfaceVertexIterator& SurfaceEdge::getTarget(void) const
{ {
return target; return target;
} }
const SurfaceVertexIterator& SurfaceEdge::getSource(void) const SurfaceVertexIterator& SurfaceEdge::getSource(void) const
{ {
return source; return source;
} }
void SurfaceEdge::pairWithOtherHalfEdge(const SurfaceEdgeIterator& otherHalfEdgeToPair) void SurfaceEdge::pairWithOtherHalfEdge(const SurfaceEdgeIterator& otherHalfEdgeToPair) const
{ {
otherHalfEdge = otherHalfEdgeToPair; otherHalfEdge = otherHalfEdgeToPair;
previousHalfEdge = otherHalfEdgeToPair; previousHalfEdge = otherHalfEdgeToPair;
nextHalfEdge = otherHalfEdgeToPair; nextHalfEdge = otherHalfEdgeToPair;
} }
const SurfaceEdgeIterator& SurfaceEdge::getOtherHalfEdge(void) const SurfaceEdgeIterator& SurfaceEdge::getOtherHalfEdge(void) const
{ {
return otherHalfEdge; return otherHalfEdge;
} }
const SurfaceEdgeIterator& SurfaceEdge::getPreviousHalfEdge(void) const SurfaceEdgeIterator& SurfaceEdge::getPreviousHalfEdge(void) const
{ {
return previousHalfEdge; return previousHalfEdge;
} }
const SurfaceEdgeIterator& SurfaceEdge::getNextHalfEdge(void) const SurfaceEdgeIterator& SurfaceEdge::getNextHalfEdge(void) const
{ {
return nextHalfEdge; return nextHalfEdge;
} }
const SurfaceTriangleIterator& SurfaceEdge::getTriangle(void) const SurfaceTriangleIterator& SurfaceEdge::getTriangle(void) const
{ {
return triangle; return triangle;
} }
void SurfaceEdge::setPreviousHalfEdge(const SurfaceEdgeIterator& previousHalfEdgeToSet) void SurfaceEdge::setPreviousHalfEdge(const SurfaceEdgeIterator& previousHalfEdgeToSet) const
{ {
previousHalfEdge = previousHalfEdgeToSet; previousHalfEdge = previousHalfEdgeToSet;
} }
void SurfaceEdge::setNextHalfEdge(const SurfaceEdgeIterator& nextHalfEdgeToSet) void SurfaceEdge::setNextHalfEdge(const SurfaceEdgeIterator& nextHalfEdgeToSet) const
{ {
nextHalfEdge = nextHalfEdgeToSet; nextHalfEdge = nextHalfEdgeToSet;
} }
void SurfaceEdge::setTriangle(const SurfaceTriangleIterator& triangleToSet) void SurfaceEdge::setTriangle(const SurfaceTriangleIterator& triangleToSet) const
{ {
triangle = triangleToSet; triangle = triangleToSet;
} }

6
source/SurfaceVertex.cpp
View File

@ -49,18 +49,18 @@ namespace Ogre
alpha = alphaToSet; alpha = alphaToSet;
} }
void SurfaceVertex::setEdge(const SurfaceEdgeIterator& edgeToSet) void SurfaceVertex::setEdge(const SurfaceEdgeIterator& edgeToSet) const
{ {
edge = edgeToSet; edge = edgeToSet;
} }
void SurfaceVertex::setNormal(const Vector3& normalToSet) void SurfaceVertex::setNormal(const Vector3& normalToSet) const
{ {
normal = normalToSet; normal = normalToSet;
normal.normalise(); normal.normalise();
} }
std::string SurfaceVertex::toString(void) std::string SurfaceVertex::toString(void) const
{ {
std::stringstream ss; std::stringstream ss;
ss << "SurfaceVertex: Position = (" << position.x << "," << position.y << "," << position.z << "), Normal = " << StringConverter::toString(normal); ss << "SurfaceVertex: Position = (" << position.x << "," << position.y << "," << position.z << "), Normal = " << StringConverter::toString(normal);