Added equals operator to CUllingSet.

Update AUTHORS file.

Change tabs to 4 spaces in ive/TextureCubeMap.cpp
This commit is contained in:
Robert Osfield 2003-09-28 10:15:10 +00:00
parent 32395ae98c
commit da8ef894c1
3 changed files with 115 additions and 97 deletions

View File

@ -85,6 +85,9 @@ Mike Connell <mikec@vsect.chalmers.se>
- First implementation of shadow occlusion culling.
- improvements to 3ds plugin.
Michael Gronager <Michael.Gronager@uni-c.dk>
- jp2 plugin - for reading and writing JPEG2000 image files
Phil Atkin <philatkin@philatkin.com>
- MacOS X port.

View File

@ -55,6 +55,20 @@ class SG_EXPORT CullingSet : public Referenced
}
}
CullingSet& operator = (const CullingSet& cs)
{
if (this==&cs) return *this;
_mask = cs._mask;
_frustum = cs._frustum;
_occluderList = cs._occluderList;
_pixelSizeVector = cs._pixelSizeVector;
_smallFeatureCullingPixelSize = cs._smallFeatureCullingPixelSize;
return *this;
}
inline void set(const CullingSet& cs)
{
_mask = cs._mask;

View File

@ -67,7 +67,8 @@ void TextureCubeMap::write(DataOutputStream* out){
}
void TextureCubeMap::read(DataInputStream* in){
void TextureCubeMap::read(DataInputStream* in)
{
// Peek on TextureCubeMap's identification.
int id = in->peekInt();
if(id == IVETEXTURECUBEMAP){