Carltonus/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix more DCDT compile errors (in gcc 4.1.2 on Linux).

Browse Source 
This was SVN commit r5417.
This commit is contained in:
Matei 2007-10-16 08:12:48 +00:00
parent f20890f5fa
commit e6604e7c0e
7 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/dcdt/se/sr_bv_nbody.cpp
View File

@ -147,11 +147,11 @@ bool SrBvNBody::insert_object ( int id, const SrModel& m )
// The "radius" of the AABB is computed as the maximum distance of the AABB
// center from any of the vertices of the object.
float dist2, distmax=0;
float dist2_, distmax=0;
int i, mvsize=m.V.size();
for ( i=0; i<mvsize; i++ )
{ dist2 = ::dist2 ( boxc, m.V[i] );
if ( dist2>distmax ) distmax=dist2;
{ dist2_ = dist2 ( boxc, m.V[i] );
if ( dist2_>distmax ) distmax=dist2_;
}
aabb->radius = (srbvreal) sqrt(double(distmax));
aabb->radius *= (srbvreal)1.0001; //add a 0.01% buffer.

2
source/dcdt/se/sr_polygon.cpp
View File

@ -455,7 +455,7 @@ int SrPolygon::pick_vertex ( const SrPnt2& p, float epsilon )
if ( size()==0 ) return imin;
for ( i=1; i<size(); i++ )
{ dist = ::dist2(get(i),p);
{ dist = dist2(get(i),p);
if ( dist<distmin || imin<0 ) { distmin=dist; imin=i; }
}

2
source/dcdt/se/sr_polygons.cpp
View File

@ -99,7 +99,7 @@ bool SrPolygons::pick_vertex ( const SrVec2& p, float epsilon, int& pid, int& vi
for ( i=0; i<size(); i++ )
{ s = const_get(i).size();
for ( j=0; j<s; j++ )
{ dist = ::dist2 ( const_get(i,j), p );
{ dist = dist2 ( const_get(i,j), p );
if ( dist<distmin || pid<0 ) { distmin=dist; pid=i; vid=j; }
}
}

2
source/dcdt/se/sr_quat.cpp
View File

@ -1,5 +1,7 @@
#include "precompiled.h"
# include "sr_quat.h"
# include "sr_vec.h"
# include "sr_random.h"
//============================== Static Data ====================================

2
source/dcdt/se/sr_set.h
View File

@ -44,7 +44,7 @@ class SrSetBasic
bool remove_gaps ( SrArray<int>& newindices );
/*! Returns the number of elements in the Set */
int SrSetBasic::elements () const { return _data.size()-_freepos.size(); }
int elements () const { return _data.size()-_freepos.size(); }
/*! Returns true if the number of elements is 0, or false otherwise */
bool empty() const { return elements()==0? true:false; }

2
source/dcdt/se/sr_vec.h
View File

@ -254,6 +254,8 @@ class SrVec
friend SrInput& operator>> ( SrInput& in, SrVec& v );
};
float angle ( const SrVec& v1, const SrVec& v2 );
//============================== end of file ===============================
# endif // SR_VEC_H

14
source/renderer/TerrainOverlay.h
View File

@ -152,7 +152,7 @@ class TriangulationTerrainOverlay : public TerrainOverlay
public:
void TriangulationTerrainOverlay::RenderCurrentPath()
void RenderCurrentPath()
{
glColor3f(1,1,1);
@ -180,7 +180,7 @@ public:
//
//Kai: added function to draw out constrained line segments in triangulation
//
void TriangulationTerrainOverlay::RenderConstrainedEdges()
void RenderConstrainedEdges()
{
std::vector<CEntity*> results;
@ -215,7 +215,7 @@ public:
//
// Kai: added function to draw out unconstrained line segments in triangulation
//
void TriangulationTerrainOverlay::RenderUnconstrainedEdges()
void RenderUnconstrainedEdges()
{
std::vector<CEntity*> results;
g_EntityManager.GetExtant(results);
@ -244,7 +244,7 @@ public:
}
void TriangulationTerrainOverlay::setCurrentPath(SrPolygon _CurPath)
void setCurrentPath(SrPolygon _CurPath)
{
CurPath = _CurPath;
@ -254,13 +254,13 @@ public:
void TriangulationTerrainOverlay::setConstrainedEdges(SrArray<SrPnt2> _constr)
void setConstrainedEdges(SrArray<SrPnt2> _constr)
{
constr = _constr;
}
void TriangulationTerrainOverlay::setUnconstrainedEdges(SrArray<SrPnt2> _unconstr)
void setUnconstrainedEdges(SrArray<SrPnt2> _unconstr)
{
unconstr = _unconstr;
@ -272,7 +272,7 @@ public:
}
TriangulationTerrainOverlay::TriangulationTerrainOverlay()
TriangulationTerrainOverlay()
{
}