Corrected gcc compiling issues
This commit is contained in:
parent
7ec9437835
commit
97d7baf66c
|
@ -24,6 +24,9 @@
|
||||||
History
|
History
|
||||||
|
|
||||||
$Log: not supported by cvs2svn $
|
$Log: not supported by cvs2svn $
|
||||||
|
Revision 1.7 2007/03/12 15:38:02 tarini
|
||||||
|
Texture coord name change! "TCoord" and "Texture" are BAD. "TexCoord" is GOOD.
|
||||||
|
|
||||||
Revision 1.6 2005/09/14 14:09:16 spinelli
|
Revision 1.6 2005/09/14 14:09:16 spinelli
|
||||||
ConstVertexPointer --> VertexPointer
|
ConstVertexPointer --> VertexPointer
|
||||||
ConstEdgePointer --> EdgePointer
|
ConstEdgePointer --> EdgePointer
|
||||||
|
@ -132,7 +135,7 @@ public:
|
||||||
|
|
||||||
inline int MemNeeded() const
|
inline int MemNeeded() const
|
||||||
{
|
{
|
||||||
return sizeof(EdgeMesh)+sizeof(VertexType)*vn+sizeof(EdgeType)*fn;
|
return sizeof(EdgeMesh)+sizeof(VertexType)*vn+sizeof(EdgeType)*en;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -161,7 +164,7 @@ static bool HasPerEdgeMark() { return EdgeType::HasEdgeMark() ; }
|
||||||
static bool HasPerEdgeQuality() { return EdgeType::HasEdgeQuality(); }
|
static bool HasPerEdgeQuality() { return EdgeType::HasEdgeQuality(); }
|
||||||
|
|
||||||
static bool HasEETopology() { return EdgeType::HasEEAdjacency(); }
|
static bool HasEETopology() { return EdgeType::HasEEAdjacency(); }
|
||||||
static bool HasVETopology() { return FaceType::HasVEAdjacency(); }
|
static bool HasVETopology() { return EdgeType::HasVEAdjacency(); }
|
||||||
static bool HasTopology() { return HasEETopology() || HasVETopology(); }
|
static bool HasTopology() { return HasEETopology() || HasVETopology(); }
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -28,6 +28,9 @@ This file contains two function providing the standard way to do picking using o
|
||||||
|
|
||||||
History
|
History
|
||||||
$Log: not supported by cvs2svn $
|
$Log: not supported by cvs2svn $
|
||||||
|
Revision 1.4 2006/10/27 08:55:15 fiorin
|
||||||
|
Added type cast (in order to remove warnings)
|
||||||
|
|
||||||
Revision 1.3 2006/02/28 13:25:48 ponchio
|
Revision 1.3 2006/02/28 13:25:48 ponchio
|
||||||
for(ii... -> for(int ii
|
for(ii... -> for(int ii
|
||||||
|
|
||||||
|
@ -58,7 +61,7 @@ int Pick( const int & x, const int &y,
|
||||||
result.clear();
|
result.clear();
|
||||||
long hits;
|
long hits;
|
||||||
int sz = int(m.size())*5;
|
int sz = int(m.size())*5;
|
||||||
unsigned int *selectBuf =new unsigned int[sz];
|
GLuint *selectBuf =new GLuint[sz];
|
||||||
glSelectBuffer(sz, selectBuf);
|
glSelectBuffer(sz, selectBuf);
|
||||||
glRenderMode(GL_SELECT);
|
glRenderMode(GL_SELECT);
|
||||||
glInitNames();
|
glInitNames();
|
||||||
|
@ -67,7 +70,7 @@ int Pick( const int & x, const int &y,
|
||||||
glPushName(-1);
|
glPushName(-1);
|
||||||
double mp[16];
|
double mp[16];
|
||||||
|
|
||||||
int viewport[4];
|
GLint viewport[4];
|
||||||
glGetIntegerv(GL_VIEWPORT,viewport);
|
glGetIntegerv(GL_VIEWPORT,viewport);
|
||||||
glMatrixMode(GL_PROJECTION);
|
glMatrixMode(GL_PROJECTION);
|
||||||
glGetDoublev(GL_PROJECTION_MATRIX ,mp);
|
glGetDoublev(GL_PROJECTION_MATRIX ,mp);
|
||||||
|
|
|
@ -24,6 +24,9 @@
|
||||||
History
|
History
|
||||||
|
|
||||||
$Log: not supported by cvs2svn $
|
$Log: not supported by cvs2svn $
|
||||||
|
Revision 1.3 2006/02/16 15:16:51 corsini
|
||||||
|
Add reference plane support
|
||||||
|
|
||||||
Revision 1.2 2006/02/15 15:40:06 corsini
|
Revision 1.2 2006/02/15 15:40:06 corsini
|
||||||
Decouple SVG properties and exporter for simmetry with the other exporter
|
Decouple SVG properties and exporter for simmetry with the other exporter
|
||||||
|
|
||||||
|
@ -273,11 +276,11 @@ public:
|
||||||
Point2f pmin(100000000.0f, 100000000.0f);
|
Point2f pmin(100000000.0f, 100000000.0f);
|
||||||
Point2f pmax(-100000000.0f, -100000000.0f);
|
Point2f pmax(-100000000.0f, -100000000.0f);
|
||||||
|
|
||||||
EdgeMeshType::EdgeIterator i;
|
typename EdgeMeshType::EdgeIterator i;
|
||||||
for (i = mp->edges.begin(); i != mp->edges.end(); ++i)
|
for (i = mp->edges.begin(); i != mp->edges.end(); ++i)
|
||||||
{
|
{
|
||||||
Point3<EdgeMeshType::ScalarType> p1 = (*i).V(0)->P();
|
Point3<typename EdgeMeshType::ScalarType> p1 = (*i).V(0)->P();
|
||||||
Point3<EdgeMeshType::ScalarType> p2 = (*i).V(1)->P();
|
Point3<typename EdgeMeshType::ScalarType> p2 = (*i).V(1)->P();
|
||||||
|
|
||||||
Point3d p1d(p1[0], p1[1], p1[2]);
|
Point3d p1d(p1[0], p1[1], p1[2]);
|
||||||
Point3d p2d(p2[0], p2[1], p2[2]);
|
Point3d p2d(p2[0], p2[1], p2[2]);
|
||||||
|
|
Loading…
Reference in New Issue