janwas
c0ed950657
this snowballed into a massive search+destroy of the hodgepodge of mostly equivalent types we had in use (int, uint, unsigned, unsigned int, i32, u32, ulong, uintN). it is more efficient to use 64-bit types in 64-bit mode, so the preferred default is size_t (for anything remotely resembling a size or index). tile coordinates are ssize_t to allow more efficient conversion to/from floating point. flags are int because we almost never need more than 15 distinct bits, bit test/set is not slower and int is fastest to type. finally, some data that is pretty much directly passed to OpenGL is now typed accordingly. after several hours, the code now requires fewer casts and less guesswork. other changes: - unit and player IDs now have an "invalid id" constant in the respective class to avoid casting and -1 - fix some endian/64-bit bugs in the map (un)packing. added a convenience function to write/read a size_t. - ia32: change CPUID interface to allow passing in ecx (required for cache topology detection, which I need at work). remove some unneeded functions from asm, replace with intrinsics where possible. This was SVN commit r5942.
50 lines
1.6 KiB
C++
50 lines
1.6 KiB
C++
/**
|
|
* =========================================================================
|
|
* File : HFTracer.h
|
|
* Project : 0 A.D.
|
|
* Description : Determine intersection of rays with a heightfield.
|
|
* =========================================================================
|
|
*/
|
|
|
|
#ifndef INCLUDED_HFTRACER
|
|
#define INCLUDED_HFTRACER
|
|
|
|
class CVector3D;
|
|
class CTerrain;
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
// CHFTracer: a class for determining ray intersections with a heightfield
|
|
class CHFTracer
|
|
{
|
|
public:
|
|
// constructor; setup data
|
|
CHFTracer(CTerrain *pTerrain);
|
|
|
|
// intersect ray with this heightfield; return true if intersection
|
|
// occurs (and fill in grid coordinates and point of intersection), or false otherwise
|
|
bool RayIntersect(CVector3D& origin,CVector3D& dir,int& x,int& z,CVector3D& ipt) const;
|
|
|
|
private:
|
|
// intersect a ray with triangle defined by vertices
|
|
// v0,v1,v2; return true if ray hits triangle at distance less than dist,
|
|
// or false otherwise
|
|
bool RayTriIntersect(const CVector3D& v0,const CVector3D& v1,const CVector3D& v2,
|
|
const CVector3D& origin,const CVector3D& dir,float& dist) const;
|
|
|
|
// test if ray intersects either of the triangles in the given
|
|
bool CellIntersect(int cx,int cz,CVector3D& origin,CVector3D& dir,float& dist) const;
|
|
|
|
// The terrain we're operating on
|
|
CTerrain *m_pTerrain;
|
|
// the heightfield were tracing
|
|
const u16* m_Heightfield;
|
|
// size of the heightfield
|
|
size_t m_MapSize;
|
|
// cell size - size of each cell in x and z
|
|
float m_CellSize;
|
|
// vertical scale - size of each cell in y
|
|
float m_HeightScale;
|
|
};
|
|
|
|
#endif
|