Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Warnings, throw(NLMISC::EStream) deprecated in C++11 and removed in C++17, and class keyword is useless

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2018-02-02 21:04:30 +01:00
parent f790af1d57
commit 613d4ddc34
333 changed files with 707 additions and 707 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/include/nel/3d/flare_shape.h
View file

@ -55,7 +55,7 @@ public:
CFlareShape(); CFlareShape();
/// serial this shape /// serial this shape
void serial(NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
//@} //@}

12
code/nel/include/nel/3d/mesh.h
View file

@ -85,7 +85,7 @@ public:
// This is slow but doesn't matter since used at mesh building.... // This is slow but doesn't matter since used at mesh building....
CCorner(); CCorner();
void serial(NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
}; };
/// A Triangle face. /// A Triangle face.
@ -94,7 +94,7 @@ public:
CCorner Corner[3]; CCorner Corner[3];
sint32 MaterialId; sint32 MaterialId;
sint32 SmoothGroup; sint32 SmoothGroup;
void serial(NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
}; };
@ -118,7 +118,7 @@ public:
} }
} }
void serial(NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
}; };
struct CVertLink struct CVertLink
@ -203,7 +203,7 @@ public:
CMeshBuild(); CMeshBuild();
// Serialization // Serialization
//void serial(NLMISC::IStream &f) throw(NLMISC::EStream); //void serial(NLMISC::IStream &f);
}; };
//@} //@}
@ -257,7 +257,7 @@ public:
virtual void render(IDriver *drv, CTransformShape *trans, bool opaquePass); virtual void render(IDriver *drv, CTransformShape *trans, bool opaquePass);
/// serial this mesh. /// serial this mesh.
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CMesh); NLMISC_DECLARE_CLASS(CMesh);
/// get trinagle count. /// get trinagle count.
@ -370,7 +370,7 @@ public:
virtual float getNumTriangles (float distance); virtual float getNumTriangles (float distance);
/// serial this mesh. /// serial this mesh.
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CMeshGeom); NLMISC_DECLARE_CLASS(CMeshGeom);
// profile // profile

4
code/nel/include/nel/3d/mesh_base.h
View file

@ -146,7 +146,7 @@ public:
CMeshBaseBuild(); CMeshBaseBuild();
// Serialization is not used // Serialization is not used
//void serial(NLMISC::IStream &f) throw(NLMISC::EStream); //void serial(NLMISC::IStream &f);
}; };
//@} //@}
@ -201,7 +201,7 @@ public:
// @} // @}
/// serial the base Part of this mesh. /// serial the base Part of this mesh.
void serialMeshBase(NLMISC::IStream &f) throw(NLMISC::EStream); void serialMeshBase(NLMISC::IStream &f);
/// Flush textures /// Flush textures
void flushTextures (IDriver &driver, uint selectedTexture); void flushTextures (IDriver &driver, uint selectedTexture);

4
code/nel/include/nel/3d/mesh_morpher.h
View file

@ -43,7 +43,7 @@ public:
std::vector<uint32> VertRefs; // Array of vertices reference std::vector<uint32> VertRefs; // Array of vertices reference
void serial (NLMISC::IStream &f) throw(NLMISC::EStream); void serial (NLMISC::IStream &f);
}; };
// *************************************************************************** // ***************************************************************************
@ -90,7 +90,7 @@ public:
NLMISC::CObjectVector<CRawSkinVertex*, false> &vertexRemap, NLMISC::CObjectVector<CRawSkinVertex*, false> &vertexRemap,
std::vector<CAnimatedMorph> *pBSFactor); std::vector<CAnimatedMorph> *pBSFactor);
void serial (NLMISC::IStream &f) throw(NLMISC::EStream); void serial (NLMISC::IStream &f);
private: private:

10
code/nel/include/nel/3d/mesh_mrm.h
View file

@ -115,7 +115,7 @@ public:
virtual float getNumTriangles (float distance); virtual float getNumTriangles (float distance);
/// serial this meshGeom. /// serial this meshGeom.
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CMeshMRMGeom); NLMISC_DECLARE_CLASS(CMeshMRMGeom);
/// Scene profile /// Scene profile
@ -579,11 +579,11 @@ private:
/// load the header of this mesh. return the version of the header. /// load the header of this mesh. return the version of the header.
sint loadHeader(NLMISC::IStream &f) throw(NLMISC::EStream); sint loadHeader(NLMISC::IStream &f);
/// load this mesh. /// load this mesh.
void load(NLMISC::IStream &f) throw(NLMISC::EStream); void load(NLMISC::IStream &f);
/// save the entire mesh. /// save the entire mesh.
void save(NLMISC::IStream &f) throw(NLMISC::EStream); void save(NLMISC::IStream &f);
// Build bone Usage information for serialized mesh <= version 2. // Build bone Usage information for serialized mesh <= version 2.
void buildBoneUsageVer2 (); void buildBoneUsageVer2 ();
@ -702,7 +702,7 @@ public:
virtual float getNumTriangles (float distance); virtual float getNumTriangles (float distance);
/// serial this mesh. /// serial this mesh.
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CMeshMRM); NLMISC_DECLARE_CLASS(CMeshMRM);
/// Get bbox. /// Get bbox.

4
code/nel/include/nel/3d/mesh_multi_lod.h
View file

@ -125,7 +125,7 @@ public:
virtual void getAABBox(NLMISC::CAABBox &bbox) const; virtual void getAABBox(NLMISC::CAABBox &bbox) const;
/// serial this mesh. /// serial this mesh.
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
/// Declare name of the shape /// Declare name of the shape
NLMISC_DECLARE_CLASS(CMeshMultiLod); NLMISC_DECLARE_CLASS(CMeshMultiLod);
@ -238,7 +238,7 @@ private:
std::vector<TCoarseMeshIndexType> CoarseTriangles; std::vector<TCoarseMeshIndexType> CoarseTriangles;
/// Serial /// Serial
void serial(NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
/// Is Opaque ? /// Is Opaque ?
bool isOpaque() { return (Flags&IsOpaque)!=0; } bool isOpaque() { return (Flags&IsOpaque)!=0; }

2
code/nel/include/nel/3d/meshvp_per_pixel_light.h
View file

@ -65,7 +65,7 @@ public:
const NLMISC::CMatrix &invertedModelMat, const NLMISC::CMatrix &invertedModelMat,
const NLMISC::CVector &viewerPos); const NLMISC::CVector &viewerPos);
virtual void end(IDriver *drv); virtual void end(IDriver *drv);
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
virtual void setupForMaterial(const CMaterial &mat, virtual void setupForMaterial(const CMaterial &mat,
IDriver *drv, IDriver *drv,
CScene *scene, CScene *scene,

2
code/nel/include/nel/3d/meshvp_wind_tree.h
View file

@ -90,7 +90,7 @@ public:
virtual float getMaxVertexMove(); virtual float getMaxVertexMove();
// Serial. // Serial.
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CMeshVPWindTree); NLMISC_DECLARE_CLASS(CMeshVPWindTree);
// @} // @}

8
code/nel/include/nel/3d/packed_world.h
View file

@ -54,9 +54,9 @@ public:
void build(std::vector<TPackedZoneBaseSPtr> &packesZones); void build(std::vector<TPackedZoneBaseSPtr> &packesZones);
bool raytrace(const NLMISC::CVector &start, const NLMISC::CVector &end, NLMISC::CVector &inter, std::vector<NLMISC::CTriangle> *testedTriangles = NULL, NLMISC::CVector *normal = NULL); bool raytrace(const NLMISC::CVector &start, const NLMISC::CVector &end, NLMISC::CVector &inter, std::vector<NLMISC::CTriangle> *testedTriangles = NULL, NLMISC::CVector *normal = NULL);
void getZones(std::vector<TPackedZoneBaseSPtr> &zones); void getZones(std::vector<TPackedZoneBaseSPtr> &zones);
void serial(NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
// just serialize the header, containing name of the zones this CPackedWorld was built from // just serialize the header, containing name of the zones this CPackedWorld was built from
void serialZoneNames(NLMISC::IStream &f) throw(NLMISC::EStream); void serialZoneNames(NLMISC::IStream &f);
/** Roughly select triangles that are within a convex 2D polygon (world coordinates) /** Roughly select triangles that are within a convex 2D polygon (world coordinates)
* Selection is not exact, because limited to the resolution of the grid into which is packed each zone. * Selection is not exact, because limited to the resolution of the grid into which is packed each zone.
* Triangle that are within are guaranteed to be selected, however. * Triangle that are within are guaranteed to be selected, however.
@ -68,7 +68,7 @@ private:
public: public:
TPackedZoneBaseSPtr Zone; TPackedZoneBaseSPtr Zone;
uint32 RaytraceCounter; uint32 RaytraceCounter;
void serial(NLMISC::IStream &f) throw(NLMISC::EStream) void serial(NLMISC::IStream &f)
{ {
f.serialVersion(1); f.serialVersion(1);
CPackedZoneBase *pz = Zone; CPackedZoneBase *pz = Zone;
@ -81,7 +81,7 @@ private:
{ {
public: public:
std::vector<uint32> IDs; // make a class from this vector just for serialization std::vector<uint32> IDs; // make a class from this vector just for serialization
void serial(NLMISC::IStream &f) throw(NLMISC::EStream) void serial(NLMISC::IStream &f)
{ {
f.serialCont(IDs); f.serialCont(IDs);
} }

12
code/nel/include/nel/3d/packed_zone.h
View file

@ -52,7 +52,7 @@ class CPackedVertex
public: public:
uint16 X, Y, Z; uint16 X, Y, Z;
public: public:
void serial(NLMISC::IStream &f) throw(NLMISC::EStream) void serial(NLMISC::IStream &f)
{ {
f.serial(X, Y, Z); f.serial(X, Y, Z);
} }
@ -68,7 +68,7 @@ class CPackedTri
public: public:
uint32 V0, V1, V2; uint32 V0, V1, V2;
public: public:
void serial(NLMISC::IStream &f) throw(NLMISC::EStream) void serial(NLMISC::IStream &f)
{ {
f.serial(V0, V1, V2); f.serial(V0, V1, V2);
} }
@ -79,7 +79,7 @@ class CPackedTri16
public: public:
uint16 V0, V1, V2; uint16 V0, V1, V2;
public: public:
void serial(NLMISC::IStream &f) throw(NLMISC::EStream) void serial(NLMISC::IStream &f)
{ {
f.serial(V0, V1, V2); f.serial(V0, V1, V2);
} }
@ -101,7 +101,7 @@ public:
sint32 ZoneY; sint32 ZoneY;
public: public:
virtual ~CPackedZoneBase() {} virtual ~CPackedZoneBase() {}
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream) = 0; virtual void serial(NLMISC::IStream &f) = 0;
// TMP For debug : render position covered by a frustum // TMP For debug : render position covered by a frustum
virtual void render(CVertexBuffer &vb, IDriver &drv, CMaterial &mat, CMaterial &wiredMaterial, const NLMISC::CMatrix &camMat, uint batchSize, const NLMISC::CVector localFrustCorners[8]) = 0; virtual void render(CVertexBuffer &vb, IDriver &drv, CMaterial &mat, CMaterial &wiredMaterial, const NLMISC::CMatrix &camMat, uint batchSize, const NLMISC::CVector localFrustCorners[8]) = 0;
// raytracing test // raytracing test
@ -138,7 +138,7 @@ public:
sint32 zoneX, sint32 zoneX,
sint32 zoneY sint32 zoneY
); );
void serial(NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
// TMP For debug : render porition covered by a frustum // TMP For debug : render porition covered by a frustum
void render(CVertexBuffer &vb, IDriver &drv, CMaterial &mat, CMaterial &wiredMaterial, const NLMISC::CMatrix &camMat, uint batchSize, const NLMISC::CVector localFrustCorners[8]); void render(CVertexBuffer &vb, IDriver &drv, CMaterial &mat, CMaterial &wiredMaterial, const NLMISC::CMatrix &camMat, uint batchSize, const NLMISC::CVector localFrustCorners[8]);
// try to build a 16 bit version of this packed zone to save some more place // try to build a 16 bit version of this packed zone to save some more place
@ -183,7 +183,7 @@ public:
NLMISC_DECLARE_CLASS(CPackedZone16) NLMISC_DECLARE_CLASS(CPackedZone16)
CPackedZone16(); CPackedZone16();
// //
void serial(NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
// TMP For debug : render position covered by a frustum // TMP For debug : render position covered by a frustum
void render(CVertexBuffer &vb, IDriver &drv, CMaterial &mat, CMaterial &wiredMaterial, const NLMISC::CMatrix &camMat, uint batchSize, const NLMISC::CVector localFrustCorners[8]); void render(CVertexBuffer &vb, IDriver &drv, CMaterial &mat, CMaterial &wiredMaterial, const NLMISC::CMatrix &camMat, uint batchSize, const NLMISC::CVector localFrustCorners[8]);
// raytracing test // raytracing test

2
code/nel/include/nel/3d/particle_system.h
View file

@ -84,7 +84,7 @@ public:
/// dtor /// dtor
virtual ~CParticleSystem(); virtual ~CParticleSystem();
/// serialize this particle system /// serialize this particle system
void serial(NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
/** Merge this system with a system instanciated from the given shape /** Merge this system with a system instanciated from the given shape
* NB : This is for edition purpose, this is slow * NB : This is for edition purpose, this is slow
* \return true if the operation could be performed. It can fail when this cause the system the system to last forever, * \return true if the operation could be performed. It can fail when this cause the system the system to last forever,

2
code/nel/include/nel/3d/particle_system_process.h
View file

@ -102,7 +102,7 @@ class CParticleSystemProcess : public NLMISC::IStreamable
* Everything is saved, except for the fontManager and the fontGenerator. * Everything is saved, except for the fontManager and the fontGenerator.
* They must be set again if the PSToolRender pass is used. * They must be set again if the PSToolRender pass is used.
*/ */
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream) ; virtual void serial(NLMISC::IStream &f);
/// @} /// @}

2
code/nel/include/nel/3d/particle_system_shape.h
View file

@ -90,7 +90,7 @@ public:
// @} // @}
/// serial the shape /// serial the shape
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CParticleSystemShape); NLMISC_DECLARE_CLASS(CParticleSystemShape);

6
code/nel/include/nel/3d/ps_attrib.h
View file

@ -202,7 +202,7 @@ public:
uint size() const { return _Size; } uint size() const { return _Size; }
/// serialization /// serialization
void serial(NLMISC::IStream &f) throw(NLMISC::EStream) void serial(NLMISC::IStream &f)
{ {
if (f.isReading()) if (f.isReading())
{ {
@ -262,7 +262,7 @@ public:
CPSAttrib(); CPSAttrib();
/// Serialization method /// Serialization method
void serial(NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
// swap with another vector // swap with another vector
void swap(CPSAttrib<T> &other); void swap(CPSAttrib<T> &other);
@ -429,7 +429,7 @@ void CPSAttrib<T>::remove(uint32 index)
} }
template <typename T> template <typename T>
void CPSAttrib<T>::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSAttrib<T>::serial(NLMISC::IStream &f)
{ {
// version 4 to 5 => bug with size being > capacity // version 4 to 5 => bug with size being > capacity
sint ver = f.serialVersion(5); sint ver = f.serialVersion(5);

4
code/nel/include/nel/3d/ps_attrib_maker.h
View file

@ -60,7 +60,7 @@ struct CPSInputType
uint32 UserParamNum; uint32 UserParamNum;
}; };
void serial(NLMISC::IStream &f) throw(NLMISC::EStream) void serial(NLMISC::IStream &f)
{ {
f.serialEnum(InputType); f.serialEnum(InputType);
switch(InputType) switch(InputType)
@ -124,7 +124,7 @@ public:
} }
/// serialisation of the object. Derivers MUST call this, (if they use the attribute of this class at least) /// serialisation of the object. Derivers MUST call this, (if they use the attribute of this class at least)
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream) virtual void serial(NLMISC::IStream &f)
{ {
f.serialVersion(1); f.serialVersion(1);
f.serial(_NbCycles); f.serial(_NbCycles);

2
code/nel/include/nel/3d/ps_attrib_maker_bin_op.h
View file

@ -103,7 +103,7 @@ public:
uint32 srcStep = (1 << 16) uint32 srcStep = (1 << 16)
) const; ) const;
virtual void serial (NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial (NLMISC::IStream &f);
virtual void deleteElement (uint32 index); virtual void deleteElement (uint32 index);
virtual void newElement (const CPSEmitterInfo &info); virtual void newElement (const CPSEmitterInfo &info);
virtual void resize (uint32 capacity, uint32 nbPresentElements); virtual void resize (uint32 capacity, uint32 nbPresentElements);

2
code/nel/include/nel/3d/ps_attrib_maker_bin_op_inline.h
View file

@ -729,7 +729,7 @@ inline void CPSAttribMakerBinOp<T>::makeN(CPSLocated *loc,
//================================================================================================================= //=================================================================================================================
template <class T> template <class T>
inline void CPSAttribMakerBinOp<T>::serial (NLMISC::IStream &f) throw(NLMISC::EStream) inline void CPSAttribMakerBinOp<T>::serial (NLMISC::IStream &f)
{ {
if (f.isReading()) if (f.isReading())
{ {

10
code/nel/include/nel/3d/ps_attrib_maker_helper.h
View file

@ -96,7 +96,7 @@ template <typename T, class F> class CPSAttribMakerT : public CPSAttribMaker<T>
/// serialization of the object /// serialization of the object
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream) virtual void serial(NLMISC::IStream &f)
{ {
sint ver = f.serialVersion(2); sint ver = f.serialVersion(2);
CPSAttribMaker<T>::serial(f); CPSAttribMaker<T>::serial(f);
@ -1624,7 +1624,7 @@ public:
} }
/// serialisation of the object. Derivers MUST call this, (if they use the attribute of this class at least) /// serialisation of the object. Derivers MUST call this, (if they use the attribute of this class at least)
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream) virtual void serial(NLMISC::IStream &f)
{ {
f.serialVersion(1); f.serialVersion(1);
@ -1744,7 +1744,7 @@ public:
_MaxValue = other._MaxValue; _MaxValue = other._MaxValue;
} }
// serial. Should update min / max when reading // serial. Should update min / max when reading
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
virtual uint32 getMinValue(void) const { return _MinValue; } virtual uint32 getMinValue(void) const { return _MinValue; }
virtual uint32 getMaxValue(void) const { return _MaxValue; } virtual uint32 getMaxValue(void) const { return _MaxValue; }
virtual void newElement(const CPSEmitterInfo &info); virtual void newElement(const CPSEmitterInfo &info);
@ -1767,7 +1767,7 @@ public:
_MaxValue = other._MaxValue; _MaxValue = other._MaxValue;
} }
// serial. Should update min / max when reading // serial. Should update min / max when reading
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
virtual sint32 getMinValue(void) const { return _MinValue; } virtual sint32 getMinValue(void) const { return _MinValue; }
virtual sint32 getMaxValue(void) const { return _MaxValue; } virtual sint32 getMaxValue(void) const { return _MaxValue; }
virtual void newElement(const CPSEmitterInfo &info); virtual void newElement(const CPSEmitterInfo &info);
@ -1790,7 +1790,7 @@ public:
_MaxValue = other._MaxValue; _MaxValue = other._MaxValue;
} }
// serial. Should update min / max when reading // serial. Should update min / max when reading
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
virtual float getMinValue(void) const { return _MinValue; } virtual float getMinValue(void) const { return _MinValue; }
virtual float getMaxValue(void) const { return _MaxValue; } virtual float getMaxValue(void) const { return _MaxValue; }
virtual void newElement(const CPSEmitterInfo &info); virtual void newElement(const CPSEmitterInfo &info);

8
code/nel/include/nel/3d/ps_attrib_maker_template.h
View file

@ -93,7 +93,7 @@ public:
CPSValueBlendFunc() {} CPSValueBlendFunc() {}
/// serialization /// serialization
void serial(NLMISC::IStream &f) throw(NLMISC::EStream) void serial(NLMISC::IStream &f)
{ {
f.serialVersion(1); f.serialVersion(1);
f.serial(_StartValue, _EndValue); f.serial(_StartValue, _EndValue);
@ -228,7 +228,7 @@ public:
CPSValueBlendSampleFunc() {} CPSValueBlendSampleFunc() {}
/// serialization /// serialization
void serial(NLMISC::IStream &f) throw(NLMISC::EStream) void serial(NLMISC::IStream &f)
{ {
f.serialVersion(1); f.serialVersion(1);
if (f.isReading()) if (f.isReading())
@ -353,7 +353,7 @@ public:
} }
/// serialization /// serialization
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
T getMaxValue(void) const T getMaxValue(void) const
@ -493,7 +493,7 @@ void CPSValueGradientFunc<T>::setValuesUnpacked(const T *valueTab, uint32 numVal
template <typename T> template <typename T>
void CPSValueGradientFunc<T>::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSValueGradientFunc<T>::serial(NLMISC::IStream &f)
{ {
f.serialVersion(1); f.serialVersion(1);
f.serial(_NbStages); f.serial(_NbStages);

12
code/nel/include/nel/3d/ps_color.h
View file

@ -66,7 +66,7 @@ public:
{ {
CPSValueBlendFunc<NLMISC::CRGBA>::setValues(convertVBColor(startValue, _ColorType), convertVBColor(endValue, _ColorType)); CPSValueBlendFunc<NLMISC::CRGBA>::setValues(convertVBColor(startValue, _ColorType), convertVBColor(endValue, _ColorType));
} }
void serial(NLMISC::IStream &f) throw(NLMISC::EStream) void serial(NLMISC::IStream &f)
{ {
setColorType(CVertexBuffer::TRGBA); setColorType(CVertexBuffer::TRGBA);
CPSValueBlendFunc<NLMISC::CRGBA>::serial(f); CPSValueBlendFunc<NLMISC::CRGBA>::serial(f);
@ -100,7 +100,7 @@ public:
{ {
CPSValueBlendSampleFunc<NLMISC::CRGBA, RGBA_BLENDER_NUM_VALUES>::setValues(convertVBColor(startValue, _ColorType), convertVBColor(endValue, _ColorType)); CPSValueBlendSampleFunc<NLMISC::CRGBA, RGBA_BLENDER_NUM_VALUES>::setValues(convertVBColor(startValue, _ColorType), convertVBColor(endValue, _ColorType));
} }
void serial(NLMISC::IStream &f) throw(NLMISC::EStream) void serial(NLMISC::IStream &f)
{ {
setColorType(CVertexBuffer::TRGBA); setColorType(CVertexBuffer::TRGBA);
CPSValueBlendSampleFunc<NLMISC::CRGBA, RGBA_BLENDER_NUM_VALUES>::serial(f); CPSValueBlendSampleFunc<NLMISC::CRGBA, RGBA_BLENDER_NUM_VALUES>::serial(f);
@ -124,7 +124,7 @@ public:
NLMISC::CRGBA getValue(uint index) const; NLMISC::CRGBA getValue(uint index) const;
void setValues(const NLMISC::CRGBA *valueTab, uint32 numValues, uint32 nbStages); void setValues(const NLMISC::CRGBA *valueTab, uint32 numValues, uint32 nbStages);
void setValuesUnpacked(const NLMISC::CRGBA *valueTab, uint32 numValues, uint32 nbStages); void setValuesUnpacked(const NLMISC::CRGBA *valueTab, uint32 numValues, uint32 nbStages);
void serial(NLMISC::IStream &f) throw(NLMISC::EStream) void serial(NLMISC::IStream &f)
{ {
setColorType(CVertexBuffer::TRGBA); setColorType(CVertexBuffer::TRGBA);
CPSValueGradientFunc<NLMISC::CRGBA>::serial(f); CPSValueGradientFunc<NLMISC::CRGBA>::serial(f);
@ -153,7 +153,7 @@ public:
this->_F.setColorType(colorType); this->_F.setColorType(colorType);
} }
// serialisation should always be done in RGBA mode, so enforce that // serialisation should always be done in RGBA mode, so enforce that
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream) virtual void serial(NLMISC::IStream &f)
{ {
setColorType(CVertexBuffer::TRGBA); setColorType(CVertexBuffer::TRGBA);
CPSAttribMakerT<NLMISC::CRGBA, F>::serial(f); CPSAttribMakerT<NLMISC::CRGBA, F>::serial(f);
@ -229,7 +229,7 @@ public:
virtual void setColorType(CVertexBuffer::TVertexColorType colorType); virtual void setColorType(CVertexBuffer::TVertexColorType colorType);
virtual void setDefaultValue(NLMISC::CRGBA defaultValue); virtual void setDefaultValue(NLMISC::CRGBA defaultValue);
virtual NLMISC::CRGBA getDefaultValue(void) const; virtual NLMISC::CRGBA getDefaultValue(void) const;
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
protected: protected:
CVertexBuffer::TVertexColorType _ColorType; CVertexBuffer::TVertexColorType _ColorType;
}; };
@ -244,7 +244,7 @@ public:
NLMISC_DECLARE_CLASS(CPSColorBinOp); NLMISC_DECLARE_CLASS(CPSColorBinOp);
CPSAttribMakerBase *clone() const { return new CPSColorBinOp(*this); } CPSAttribMakerBase *clone() const { return new CPSColorBinOp(*this); }
virtual void setColorType(CVertexBuffer::TVertexColorType colorType); virtual void setColorType(CVertexBuffer::TVertexColorType colorType);
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
}; };

2
code/nel/include/nel/3d/ps_dot.h
View file

@ -46,7 +46,7 @@ public:
NLMISC_DECLARE_CLASS(CPSDot); NLMISC_DECLARE_CLASS(CPSDot);
///serialisation ///serialisation
void serial(NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
/// return true if there are transparent faces in the object /// return true if there are transparent faces in the object
virtual bool hasTransparentFaces(void); virtual bool hasTransparentFaces(void);

16
code/nel/include/nel/3d/ps_emitter.h
View file

@ -171,7 +171,7 @@ public:
const CPSAttribMaker<uint32> *getGenNbScheme(void) const { return _GenNbScheme; } const CPSAttribMaker<uint32> *getGenNbScheme(void) const { return _GenNbScheme; }
/// Serialization /// Serialization
void serial(NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
///\name Speed vector options ///\name Speed vector options
//@{ //@{
@ -424,7 +424,7 @@ class CPSModulatedEmitter
bool useEmitteeSpeedScheme(void) const { return _EmitteeSpeedScheme != NULL; } bool useEmitteeSpeedScheme(void) const { return _EmitteeSpeedScheme != NULL; }
/// serialization /// serialization
void serialEmitteeSpeedScheme(NLMISC::IStream &f) throw(NLMISC::EStream); void serialEmitteeSpeedScheme(NLMISC::IStream &f);
protected: protected:
@ -470,7 +470,7 @@ public:
} }
/// Serialisation /// Serialisation
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CPSEmitterDirectionnal); NLMISC_DECLARE_CLASS(CPSEmitterDirectionnal);
@ -506,7 +506,7 @@ class CPSRadialEmitter : public CPSEmitterDirectionnal
if (CParticleSystem::getSerializeIdentifierFlag()) _Name = std::string("RadialEmitter"); if (CParticleSystem::getSerializeIdentifierFlag()) _Name = std::string("RadialEmitter");
} }
/// Serialisation /// Serialisation
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CPSRadialEmitter); NLMISC_DECLARE_CLASS(CPSRadialEmitter);
virtual void emit(const NLMISC::CVector &srcPos, uint32 index, NLMISC::CVector &pos, NLMISC::CVector &speed); virtual void emit(const NLMISC::CVector &srcPos, uint32 index, NLMISC::CVector &pos, NLMISC::CVector &speed);
}; };
@ -527,7 +527,7 @@ public:
} }
/// Serialisation /// Serialisation
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CPSEmitterOmni); NLMISC_DECLARE_CLASS(CPSEmitterOmni);
@ -561,7 +561,7 @@ class CPSEmitterRectangle : public CPSEmitter, public CPSModulatedEmitter, publi
} }
/// Serialisation /// Serialisation
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CPSEmitterRectangle); NLMISC_DECLARE_CLASS(CPSEmitterRectangle);
@ -636,7 +636,7 @@ public:
} }
/// Serialisation /// Serialisation
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CPSEmitterConic); NLMISC_DECLARE_CLASS(CPSEmitterConic);
@ -675,7 +675,7 @@ public:
} }
/// Serialisation /// Serialisation
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CPSSphericalEmitter); NLMISC_DECLARE_CLASS(CPSSphericalEmitter);

2
code/nel/include/nel/3d/ps_face.h
View file

@ -69,7 +69,7 @@ public:
*/ */
CPSFace(CSmartPtr<ITexture> tex = NULL); CPSFace(CSmartPtr<ITexture> tex = NULL);
void serial(NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CPSFace); NLMISC_DECLARE_CLASS(CPSFace);
/** Tells that all faces are turning in the same manner, and only have a rotationnal bias /** Tells that all faces are turning in the same manner, and only have a rotationnal bias

2
code/nel/include/nel/3d/ps_face_look_at.h
View file

@ -40,7 +40,7 @@ public:
*/ */
CPSFaceLookAt(CSmartPtr<ITexture> tex = NULL); CPSFaceLookAt(CSmartPtr<ITexture> tex = NULL);
void serial(NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CPSFaceLookAt); NLMISC_DECLARE_CLASS(CPSFaceLookAt);

2
code/nel/include/nel/3d/ps_fan_light.h
View file

@ -47,7 +47,7 @@ public:
CPSFanLight(uint32 nbFans = 7); CPSFanLight(uint32 nbFans = 7);
/// Dtor /// Dtor
~CPSFanLight(); ~CPSFanLight();
void serial(NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
//@} //@}
// Set the number of fans used for drawing (minimum is 3, maximum is 128) // Set the number of fans used for drawing (minimum is 3, maximum is 128)

4
code/nel/include/nel/3d/ps_float.h
View file

@ -104,7 +104,7 @@ class CPSFloatCurveFunctor
CCtrlPoint(float date, float value) : Date(date), Value(value) { nlassert(Date >= 0 && Date <= 1); } CCtrlPoint(float date, float value) : Date(date), Value(value) { nlassert(Date >= 0 && Date <= 1); }
float Date; float Date;
float Value; float Value;
void serial(NLMISC::IStream &f) throw(NLMISC::EStream) void serial(NLMISC::IStream &f)
{ {
f.serial(Date, Value); f.serial(Date, Value);
} }
@ -166,7 +166,7 @@ class CPSFloatCurveFunctor
float getValue(float date) const; float getValue(float date) const;
/// serialization /// serialization
void serial(NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
float getMinValue() const { return _MinValue; } float getMinValue() const { return _MinValue; }
float getMaxValue() const { return _MaxValue; } float getMaxValue() const { return _MaxValue; }

32
code/nel/include/nel/3d/ps_force.h
View file

@ -70,7 +70,7 @@ public:
virtual void show() = 0; virtual void show() = 0;
/// Serial the force definition. MUST be called by deriver during their serialisation /// Serial the force definition. MUST be called by deriver during their serialisation
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
/// check whether this force is integrable over time. The default is false /// check whether this force is integrable over time. The default is false
virtual bool isIntegrable(void) const { return false; } virtual bool isIntegrable(void) const { return false; }
@ -175,7 +175,7 @@ public:
/// get the attribute maker for a non constant intensity /// get the attribute maker for a non constant intensity
CPSAttribMaker<float> *getIntensityScheme(void) { return _IntensityScheme; } CPSAttribMaker<float> *getIntensityScheme(void) { return _IntensityScheme; }
const CPSAttribMaker<float> *getIntensityScheme(void) const { return _IntensityScheme; } const CPSAttribMaker<float> *getIntensityScheme(void) const { return _IntensityScheme; }
void serialForceIntensity(NLMISC::IStream &f) throw(NLMISC::EStream); void serialForceIntensity(NLMISC::IStream &f);
protected: protected:
@ -209,7 +209,7 @@ protected:
class CPSForceIntensityHelper : public CPSForce, public CPSForceIntensity class CPSForceIntensityHelper : public CPSForce, public CPSForceIntensity
{ {
public: public:
void serial(NLMISC::IStream &f) throw(NLMISC::EStream) ; void serial(NLMISC::IStream &f);
protected: protected:
virtual CPSLocated *getForceIntensityOwner(void) { return _Owner; } virtual CPSLocated *getForceIntensityOwner(void) { return _Owner; }
@ -241,7 +241,7 @@ protected:
* *
* // you can provide a serialization method. Note that that if the functor parameters are set before each use, * // you can provide a serialization method. Note that that if the functor parameters are set before each use,
* // it useless to serial something ... * // it useless to serial something ...
* void serial(NLMISC::IStream &f) throw(NLMISC::EStream) * void serial(NLMISC::IStream &f)
* *
* protected: * protected:
* ... * ...
@ -275,7 +275,7 @@ public:
/// serialization /// serialization
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream) virtual void serial(NLMISC::IStream &f)
{ {
f.serialVersion(1); f.serialVersion(1);
CPSForce::serial(f); CPSForce::serial(f);
@ -354,7 +354,7 @@ class CPSDirectionnalForce : public CPSForceIntensityHelper, public CPSDirection
} }
/// serialization /// serialization
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CPSDirectionnalForce); NLMISC_DECLARE_CLASS(CPSDirectionnalForce);
@ -397,7 +397,7 @@ public:
} }
/// serialization /// serialization
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CPSGravity); NLMISC_DECLARE_CLASS(CPSGravity);
@ -443,7 +443,7 @@ public:
} }
/// serialization /// serialization
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CPSCentralGravity); NLMISC_DECLARE_CLASS(CPSCentralGravity);
@ -464,7 +464,7 @@ public:
/// serialization /// serialization
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
/// Compute the force on the targets /// Compute the force on the targets
@ -498,7 +498,7 @@ public:
speed -= (CParticleSystem::EllapsedTime * _K * invMass * speed); speed -= (CParticleSystem::EllapsedTime * _K * invMass * speed);
} }
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream) virtual void serial(NLMISC::IStream &f)
{ {
f.serialVersion(1); f.serialVersion(1);
// we don't save intensity info : it is saved by the owning object (and set before each use of this functor) // we don't save intensity info : it is saved by the owning object (and set before each use of this functor)
@ -539,7 +539,7 @@ public:
NLMISC_DECLARE_CLASS(CPSFluidFriction) NLMISC_DECLARE_CLASS(CPSFluidFriction)
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream) virtual void serial(NLMISC::IStream &f)
{ {
f.serialVersion(1); f.serialVersion(1);
CIsotropicForceT<CPSFluidFrictionFunctor>::serial(f); CIsotropicForceT<CPSFluidFrictionFunctor>::serial(f);
@ -571,7 +571,7 @@ public:
NLMISC_DECLARE_CLASS(CPSBrownianForce) NLMISC_DECLARE_CLASS(CPSBrownianForce)
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
/// We provide a kind of integration on a predefined sequence /// We provide a kind of integration on a predefined sequence
virtual bool isIntegrable(void) const; virtual bool isIntegrable(void) const;
@ -648,7 +648,7 @@ struct CPSTurbulForceFunc
*/ */
} }
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream) virtual void serial(NLMISC::IStream &f)
{ {
f.serialVersion(1); f.serialVersion(1);
f.serial(_Scale, _NumOctaves); f.serial(_Scale, _NumOctaves);
@ -686,7 +686,7 @@ public:
NLMISC_DECLARE_CLASS(CPSTurbul) NLMISC_DECLARE_CLASS(CPSTurbul)
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream) virtual void serial(NLMISC::IStream &f)
{ {
f.serialVersion(1); f.serialVersion(1);
CIsotropicForceT<CPSTurbulForceFunc>::serial(f); CIsotropicForceT<CPSTurbulForceFunc>::serial(f);
@ -758,7 +758,7 @@ public:
// serialization // serialization
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
@ -801,7 +801,7 @@ class CPSMagneticForce : public CPSDirectionnalForce
} }
virtual void computeForces(CPSLocated &target); virtual void computeForces(CPSLocated &target);
/// serialization /// serialization
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CPSMagneticForce); NLMISC_DECLARE_CLASS(CPSMagneticForce);
}; };

2
code/nel/include/nel/3d/ps_light.h
View file

@ -42,7 +42,7 @@ public:
~CPSLight(); ~CPSLight();
NLMISC_DECLARE_CLASS(CPSLight); NLMISC_DECLARE_CLASS(CPSLight);
/// Serialisation. Derivers must override this, and call their parent version /// Serialisation. Derivers must override this, and call their parent version
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
//@} //@}
virtual uint32 getType(void) const; virtual uint32 getType(void) const;
virtual uint32 getPriority(void) const { return 600; } virtual uint32 getPriority(void) const { return 600; }

6
code/nel/include/nel/3d/ps_located.h
View file

@ -356,7 +356,7 @@ public:
void resize(uint32 newSize); void resize(uint32 newSize);
/// serialization /// serialization
void serial(NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
/// Shortcut to get an instance of the 3d driver /// Shortcut to get an instance of the 3d driver
IDriver *getDriver() const; IDriver *getDriver() const;
@ -730,7 +730,7 @@ public:
/// ctor /// ctor
CPSLocatedBindable(); CPSLocatedBindable();
/// serialization /// serialization
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
/** this should be called before to delete any bindable inserted in a system, but this is done /** this should be called before to delete any bindable inserted in a system, but this is done
* by the system, so you should never need calling it. This has been introduced because calls in dtor are not polymorphic * by the system, so you should never need calling it. This has been introduced because calls in dtor are not polymorphic
* to derived class (which are already destroyed anyway), and some infos are needed in some dtor. The default behaviour does nothing * to derived class (which are already destroyed anyway), and some infos are needed in some dtor. The default behaviour does nothing
@ -1010,7 +1010,7 @@ public:
*/ */
virtual void releaseTargetRsc(CPSLocated * /* target */) {} virtual void releaseTargetRsc(CPSLocated * /* target */) {}
/// Seralization, must be called by derivers /// Seralization, must be called by derivers
void serial(NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
/// Finalize this object : the default is to call releaseTargetRsc on targets /// Finalize this object : the default is to call releaseTargetRsc on targets
virtual void finalize(void); virtual void finalize(void);
virtual ~CPSTargetLocatedBindable(); virtual ~CPSTargetLocatedBindable();

8
code/nel/include/nel/3d/ps_mesh.h
View file

@ -82,7 +82,7 @@ public:
std::string getShape(void) const { return _Shape; } std::string getShape(void) const { return _Shape; }
/// serialisation. Derivers must override this, and call their parent version /// serialisation. Derivers must override this, and call their parent version
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
virtual ~CPSMesh(); virtual ~CPSMesh();
@ -271,7 +271,7 @@ public:
/// serialisation. Derivers must override this, and call their parent version /// serialisation. Derivers must override this, and call their parent version
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CPSConstraintMesh); NLMISC_DECLARE_CLASS(CPSConstraintMesh);
@ -334,7 +334,7 @@ public:
float WRotSpeed; /* = 0 */ float WRotSpeed; /* = 0 */
float WRotAccel; /* = 0 */ float WRotAccel; /* = 0 */
CGlobalTexAnim(); CGlobalTexAnim();
void serial(NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
/// Build a texture matrix from a date and this obj. /// Build a texture matrix from a date and this obj.
void buildMatrix(TAnimationTime date, NLMISC::CMatrix &dest); void buildMatrix(TAnimationTime date, NLMISC::CMatrix &dest);
}; };
@ -587,7 +587,7 @@ protected:
struct CGlobalTexAnims struct CGlobalTexAnims
{ {
CGlobalTexAnim Anims[IDRV_MAT_MAXTEXTURES]; CGlobalTexAnim Anims[IDRV_MAT_MAXTEXTURES];
void serial(NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
}; };
typedef CUniquePtr<CGlobalTexAnims> PGlobalTexAnims; typedef CUniquePtr<CGlobalTexAnims> PGlobalTexAnims;

16
code/nel/include/nel/3d/ps_particle_basic.h
View file

@ -107,7 +107,7 @@ public:
virtual uint32 getNumWantedTris() const = 0; virtual uint32 getNumWantedTris() const = 0;
/// serialisation. Derivers must override this, and call their parent version /// serialisation. Derivers must override this, and call their parent version
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream) virtual void serial(NLMISC::IStream &f)
{ {
/// version 3 : global color lighting /// version 3 : global color lighting
/// version 2 : auto-lod saved /// version 2 : auto-lod saved
@ -210,7 +210,7 @@ class CPSColoredParticle
virtual ~CPSColoredParticle(); virtual ~CPSColoredParticle();
/// serialization. /// serialization.
void serialColorScheme(NLMISC::IStream &f) throw(NLMISC::EStream); void serialColorScheme(NLMISC::IStream &f);
protected: protected:
@ -273,7 +273,7 @@ class CPSSizedParticle
virtual ~CPSSizedParticle(); virtual ~CPSSizedParticle();
/// serialization. We choose a different name because of multiple-inheritance /// serialization. We choose a different name because of multiple-inheritance
void serialSizeScheme(NLMISC::IStream &f) throw(NLMISC::EStream); void serialSizeScheme(NLMISC::IStream &f);
protected: protected:
@ -335,7 +335,7 @@ class CPSRotated2DParticle
virtual ~CPSRotated2DParticle(); virtual ~CPSRotated2DParticle();
/// serialization. We choose a different name because of multiple-inheritance /// serialization. We choose a different name because of multiple-inheritance
void serialAngle2DScheme(NLMISC::IStream &f) throw(NLMISC::EStream); void serialAngle2DScheme(NLMISC::IStream &f);
@ -453,7 +453,7 @@ class CPSTexturedParticle
virtual ~CPSTexturedParticle(); virtual ~CPSTexturedParticle();
/// serialization. We choose a different name because of multiple-inheritance /// serialization. We choose a different name because of multiple-inheritance
void serialTextureScheme(NLMISC::IStream &f) throw(NLMISC::EStream); void serialTextureScheme(NLMISC::IStream &f);
void enumTexs(std::vector<NLMISC::CSmartPtr<ITexture> > &dest); void enumTexs(std::vector<NLMISC::CSmartPtr<ITexture> > &dest);
@ -576,7 +576,7 @@ public:
} }
/// serial this object /// serial this object
void serialMultiTex(NLMISC::IStream &f) throw(NLMISC::EStream); void serialMultiTex(NLMISC::IStream &f);
/** setup a material from this object and a primary texture /** setup a material from this object and a primary texture
* drv is used to check the device caps. * drv is used to check the device caps.
@ -683,7 +683,7 @@ class CPSRotated3DPlaneParticle
virtual ~CPSRotated3DPlaneParticle(); virtual ~CPSRotated3DPlaneParticle();
/// serialization. We choose a different name because of multiple-inheritance /// serialization. We choose a different name because of multiple-inheritance
void serialPlaneBasisScheme(NLMISC::IStream &f) throw(NLMISC::EStream); void serialPlaneBasisScheme(NLMISC::IStream &f);
protected: protected:
/// if this is false, constant size will be used instead of a scheme /// if this is false, constant size will be used instead of a scheme
@ -806,7 +806,7 @@ public:
enum TBlendingMode { add, modulate, alphaBlend, alphaTest }; enum TBlendingMode { add, modulate, alphaBlend, alphaTest };
/// serialization (not named 'serial' because it will be used via multiple-inheritance) /// serialization (not named 'serial' because it will be used via multiple-inheritance)
void serialMaterial(NLMISC::IStream &f) throw(NLMISC::EStream); void serialMaterial(NLMISC::IStream &f);
/// set the blending mode. The default is ass /// set the blending mode. The default is ass
void setBlendingMode(CPSMaterial::TBlendingMode mode); void setBlendingMode(CPSMaterial::TBlendingMode mode);

2
code/nel/include/nel/3d/ps_plane_basis.h
View file

@ -66,7 +66,7 @@ struct CPlaneBasis
} }
void serial(NLMISC::IStream &f) throw(NLMISC::EStream) void serial(NLMISC::IStream &f)
{ {
f.serial(X, Y) ; f.serial(X, Y) ;
} }

4
code/nel/include/nel/3d/ps_plane_basis_maker.h
View file

@ -128,7 +128,7 @@ class CPSPlaneBasisFollowSpeed : public CPSAttribMaker<CPlaneBasis>
NLMISC_DECLARE_CLASS(CPSPlaneBasisFollowSpeed); NLMISC_DECLARE_CLASS(CPSPlaneBasisFollowSpeed);
/// serialization /// serialization
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream) virtual void serial(NLMISC::IStream &f)
{ {
// version 2 : added projection plane // version 2 : added projection plane
// version 1 : nothing to save here // version 1 : nothing to save here
@ -192,7 +192,7 @@ public:
/// get the number of samples for the rotation /// get the number of samples for the rotation
uint32 getNumSamples(void) const; uint32 getNumSamples(void) const;
/// serial this object /// serial this object
void serial(NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
protected: protected:
CPSVector<CPlaneBasis>::V _PBTab; CPSVector<CPlaneBasis>::V _PBTab;
uint32 _NbSamples; uint32 _NbSamples;

2
code/nel/include/nel/3d/ps_quad.h
View file

@ -114,7 +114,7 @@ protected:
void updateVbColNUVForRender(CVertexBuffer &vb, uint32 startIndex, uint32 numQuad, uint32 srcStep, IDriver &drv); void updateVbColNUVForRender(CVertexBuffer &vb, uint32 startIndex, uint32 numQuad, uint32 srcStep, IDriver &drv);
/// DERIVERS MUST CALL this /// DERIVERS MUST CALL this
void serial(NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
virtual CPSLocated *getColorOwner(void) { return _Owner; } virtual CPSLocated *getColorOwner(void) { return _Owner; }
virtual CPSLocated *getSizeOwner(void) { return _Owner; } virtual CPSLocated *getSizeOwner(void) { return _Owner; }
virtual CPSLocated *getTextureIndexOwner(void) { return _Owner; } virtual CPSLocated *getTextureIndexOwner(void) { return _Owner; }

2
code/nel/include/nel/3d/ps_ribbon.h
View file

@ -55,7 +55,7 @@ public:
/// dtor /// dtor
~CPSRibbon(); ~CPSRibbon();
/// serialisation. Derivers must override this, and call their parent version /// serialisation. Derivers must override this, and call their parent version
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
// //
NLMISC_DECLARE_CLASS(CPSRibbon); NLMISC_DECLARE_CLASS(CPSRibbon);
///@} ///@}

2
code/nel/include/nel/3d/ps_ribbon_base.h
View file

@ -52,7 +52,7 @@ public:
///@{ ///@{
CPSRibbonBase(); CPSRibbonBase();
/// serialisation. Derivers must override this, and call their parent version /// serialisation. Derivers must override this, and call their parent version
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
///@} ///@}
///\name Behaviour ///\name Behaviour

2
code/nel/include/nel/3d/ps_ribbon_look_at.h
View file

@ -38,7 +38,7 @@ public:
/// dtor /// dtor
~CPSRibbonLookAt(); ~CPSRibbonLookAt();
/// serialisation. Derivers must override this, and call their parent version /// serialisation. Derivers must override this, and call their parent version
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
// //
NLMISC_DECLARE_CLASS(CPSRibbonLookAt); NLMISC_DECLARE_CLASS(CPSRibbonLookAt);
///@} ///@}

2
code/nel/include/nel/3d/ps_shockwave.h
View file

@ -54,7 +54,7 @@ public:
float getRadiusCut(void) const { return _RadiusCut; } float getRadiusCut(void) const { return _RadiusCut; }
/// serialisation. Derivers must override this, and call their parent version /// serialisation. Derivers must override this, and call their parent version
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CPSShockWave); NLMISC_DECLARE_CLASS(CPSShockWave);

2
code/nel/include/nel/3d/ps_sound.h
View file

@ -50,7 +50,7 @@ public:
/// dtor /// dtor
~CPSSound(); ~CPSSound();
/// serialisation. Derivers must override this, and call their parent version /// serialisation. Derivers must override this, and call their parent version
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
//@} //@}
/// return this bindable type /// return this bindable type

2
code/nel/include/nel/3d/ps_tail_dot.h
View file

@ -37,7 +37,7 @@ public:
/// dtor /// dtor
~CPSTailDot(); ~CPSTailDot();
/// serialisation. Derivers must override this, and call their parent version /// serialisation. Derivers must override this, and call their parent version
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
// //
NLMISC_DECLARE_CLASS(CPSTailDot); NLMISC_DECLARE_CLASS(CPSTailDot);
///@} ///@}

14
code/nel/include/nel/3d/ps_zone.h
View file

@ -82,7 +82,7 @@ public:
/// serialization, DERIVER must override this, and call the parent version /// serialization, DERIVER must override this, and call the parent version
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
/** Inherited from CPSTargetLocatedBindable. It's called when one of the targets has been detroyed or detached /** Inherited from CPSTargetLocatedBindable. It's called when one of the targets has been detroyed or detached
@ -155,7 +155,7 @@ class CPSZonePlane : public CPSZone, public IPSMover
virtual NLMISC::CVector getNormal(uint32 index); virtual NLMISC::CVector getNormal(uint32 index);
virtual void setNormal(uint32 index, NLMISC::CVector n); virtual void setNormal(uint32 index, NLMISC::CVector n);
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
protected: protected:
TPSAttribVector _Normal; TPSAttribVector _Normal;
@ -176,7 +176,7 @@ struct CRadiusPair
{ {
// the adius, and the square radius // the adius, and the square radius
float R, R2; float R, R2;
void serial(NLMISC::IStream &f) throw(NLMISC::EStream) void serial(NLMISC::IStream &f)
{ {
f.serial(R, R2); f.serial(R, R2);
} }
@ -205,7 +205,7 @@ class CPSZoneSphere : public CPSZone, public IPSMover
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
// inherited from IPSMover // inherited from IPSMover
@ -257,7 +257,7 @@ class CPSZoneDisc : public CPSZone, public IPSMover
virtual NLMISC::CVector getNormal(uint32 index); virtual NLMISC::CVector getNormal(uint32 index);
virtual void setNormal(uint32 index, NLMISC::CVector n); virtual void setNormal(uint32 index, NLMISC::CVector n);
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
@ -303,7 +303,7 @@ class CPSZoneCylinder : public CPSZone, public IPSMover
virtual NLMISC::CVector getScale(uint32 k) const; virtual NLMISC::CVector getScale(uint32 k) const;
// serialization // serialization
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
@ -350,7 +350,7 @@ class CPSZoneRectangle : public CPSZone, public IPSMover
// serialization // serialization
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
// inherited from IPSMover // inherited from IPSMover
virtual bool supportUniformScaling(void) const { return true; } virtual bool supportUniformScaling(void) const { return true; }

2
code/nel/include/nel/3d/seg_remanence_shape.h
View file

@ -70,7 +70,7 @@ public:
// assignement // assignement
CSegRemanenceShape &operator = (const CSegRemanenceShape &other); CSegRemanenceShape &operator = (const CSegRemanenceShape &other);
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CSegRemanenceShape); NLMISC_DECLARE_CLASS(CSegRemanenceShape);
//@} //@}

2
code/nel/include/nel/3d/shape.h
View file

@ -201,7 +201,7 @@ public:
IShape* getShapePointer () const; IShape* getShapePointer () const;
/// serial the shape. /// serial the shape.
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
private: private:
IShape* _Shape; IShape* _Shape;
}; };

4
code/nel/include/nel/3d/skeleton_shape.h
View file

@ -49,7 +49,7 @@ public:
std::vector<uint8> ActiveBones; std::vector<uint8> ActiveBones;
public: public:
void serial(NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
}; };
public: public:
@ -94,7 +94,7 @@ public:
virtual float getNumTriangles (float distance); virtual float getNumTriangles (float distance);
/// serial this skeletonshape. /// serial this skeletonshape.
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CSkeletonShape); NLMISC_DECLARE_CLASS(CSkeletonShape);
/// flush textures used by this shape. /// flush textures used by this shape.

2
code/nel/include/nel/3d/texture.h
View file

@ -359,7 +359,7 @@ public:
virtual bool allowDegradation() const { return false; } virtual bool allowDegradation() const { return false; }
/// serial ITexture basic infos (clamp ...). /// serial ITexture basic infos (clamp ...).
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
/** Select a texture among several other (if this texture is a set of texture such as CTextureMultiFile) /** Select a texture among several other (if this texture is a set of texture such as CTextureMultiFile)
* The default does nothing * The default does nothing

2
code/nel/include/nel/3d/texture_blend.h
View file

@ -74,7 +74,7 @@ public:
virtual void release(); virtual void release();
// serial this texture datas // serial this texture datas
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
private: private:
uint16 _BlendFactor; uint16 _BlendFactor;

2
code/nel/include/nel/3d/texture_bump.h
View file

@ -47,7 +47,7 @@ public:
const ITexture *getHeightMap() const { return _HeightMap; }; const ITexture *getHeightMap() const { return _HeightMap; };
// serial this texture datas // serial this texture datas
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
virtual bool supportSharing() const; virtual bool supportSharing() const;

2
code/nel/include/nel/3d/texture_cube.h
View file

@ -77,7 +77,7 @@ public:
virtual bool isTextureCube() const { return true; } virtual bool isTextureCube() const { return true; }
/// Save the texture file name. /// Save the texture file name.
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CTextureCube); NLMISC_DECLARE_CLASS(CTextureCube);
/// If the face support multiple texture (such has CTextureMultiFile), this allow to select the active set /// If the face support multiple texture (such has CTextureMultiFile), this allow to select the active set

2
code/nel/include/nel/3d/texture_dlm.h
View file

@ -81,7 +81,7 @@ public:
/// TextureDLM are system. Do not need to serialize them... /// TextureDLM are system. Do not need to serialize them...
// default ctor is required for compilation with NLMISC_DECLARE_CLASS, but never called... // default ctor is required for compilation with NLMISC_DECLARE_CLASS, but never called...
CTextureDLM() {nlstop;} CTextureDLM() {nlstop;}
virtual void serial(NLMISC::IStream &/* f */) throw(NLMISC::EStream) {nlstop;} virtual void serial(NLMISC::IStream &/* f */) {nlstop;}
NLMISC_DECLARE_CLASS(CTextureDLM); NLMISC_DECLARE_CLASS(CTextureDLM);

2
code/nel/include/nel/3d/texture_emboss.h
View file

@ -46,7 +46,7 @@ public:
const ITexture *getHeightMap() const { return _HeightMap; }; const ITexture *getHeightMap() const { return _HeightMap; };
// serial this texture datas // serial this texture datas
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
virtual bool supportSharing() const; virtual bool supportSharing() const;
virtual std::string getShareName() const; virtual std::string getShareName() const;
// //

2
code/nel/include/nel/3d/texture_far.h
View file

@ -185,7 +185,7 @@ private:
void rebuildPatch (const CVector2s texturePos, const CPatchIdent &pid); void rebuildPatch (const CVector2s texturePos, const CPatchIdent &pid);
/// From IStreamable /// From IStreamable
virtual void serial(NLMISC::IStream &/* f */) throw(NLMISC::EStream) {} virtual void serial(NLMISC::IStream &/* f */) {}
// Some static buffers // Some static buffers
static NLMISC::CRGBA _LightmapExpanded[]; static NLMISC::CRGBA _LightmapExpanded[];

2
code/nel/include/nel/3d/texture_file.h
View file

@ -122,7 +122,7 @@ public:
void doGenerate(bool async = false); void doGenerate(bool async = false);
/// Save the texture file name. /// Save the texture file name.
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CTextureFile); NLMISC_DECLARE_CLASS(CTextureFile);

2
code/nel/include/nel/3d/texture_font.h
View file

@ -112,7 +112,7 @@ private:
/// Todo: serialize a font texture. /// Todo: serialize a font texture.
public: public:
virtual void serial(NLMISC::IStream &/* f */) throw(NLMISC::EStream) {nlstop;} virtual void serial(NLMISC::IStream &/* f */) {nlstop;}
NLMISC_DECLARE_CLASS(CTextureFont); NLMISC_DECLARE_CLASS(CTextureFont);
}; };

2
code/nel/include/nel/3d/texture_grouped.h
View file

@ -111,7 +111,7 @@ public:
void doGenerate(bool async = false); void doGenerate(bool async = false);
/// serialization /// serialization
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
/// a group of 4 uvs /// a group of 4 uvs

2
code/nel/include/nel/3d/texture_mem.h
View file

@ -160,7 +160,7 @@ public:
void setAllowDegradation(bool allow); void setAllowDegradation(bool allow);
/// Todo: serialize a mem texture. /// Todo: serialize a mem texture.
virtual void serial(NLMISC::IStream &/* f */) throw(NLMISC::EStream) {nlstop;} virtual void serial(NLMISC::IStream &/* f */) {nlstop;}
NLMISC_DECLARE_CLASS(CTextureMem); NLMISC_DECLARE_CLASS(CTextureMem);
/** This create a white square texture of 1x1 /** This create a white square texture of 1x1

2
code/nel/include/nel/3d/texture_multi_file.h
View file

@ -70,7 +70,7 @@ public:
/// Generate the current selected texture, looking in CPath if necessary. /// Generate the current selected texture, looking in CPath if necessary.
virtual void doGenerate(bool async = false); virtual void doGenerate(bool async = false);
/// Serial this object /// Serial this object
virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); virtual void serial(NLMISC::IStream &f);
NLMISC_DECLARE_CLASS(CTextureMultiFile); NLMISC_DECLARE_CLASS(CTextureMultiFile);
private: private:

2
code/nel/include/nel/3d/texture_near.h
View file

@ -77,7 +77,7 @@ public:
/// TextureNear are system. Do not need to serialize them... /// TextureNear are system. Do not need to serialize them...
// default ctor is required for compilation with NLMISC_DECLARE_CLASS, but never called... // default ctor is required for compilation with NLMISC_DECLARE_CLASS, but never called...
CTextureNear() {nlstop;} CTextureNear() {nlstop;}
virtual void serial(NLMISC::IStream &/* f */) throw(NLMISC::EStream) {nlstop;} virtual void serial(NLMISC::IStream &/* f */) {nlstop;}
NLMISC_DECLARE_CLASS(CTextureNear); NLMISC_DECLARE_CLASS(CTextureNear);
private: private:

12
code/nel/include/nel/3d/tile_bank.h
View file

@ -77,7 +77,7 @@ public:
{ {
return (_Flags&NL3D_CTILE_FREE_FLAG)!=0; return (_Flags&NL3D_CTILE_FREE_FLAG)!=0;
} }
void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
void setFileName (TBitmap bitmapType, const std::string& name) void setFileName (TBitmap bitmapType, const std::string& name)
{ {
// not free // not free
@ -180,7 +180,7 @@ public:
void clear(){ _TileSet.clear(); } void clear(){ _TileSet.clear(); }
void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
private: private:
// internal use // internal use
@ -210,7 +210,7 @@ public:
{ {
return _Tile; return _Tile;
} }
void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
private: private:
sint32 _Tile; sint32 _Tile;
@ -236,7 +236,7 @@ public:
void doubleSize (); void doubleSize ();
bool operator== (const CTileBorder& border) const; bool operator== (const CTileBorder& border) const;
void operator= (const CTileBorder& border); void operator= (const CTileBorder& border);
void serial(NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
bool isSet() const bool isSet() const
{ {
return _Set; return _Set;
@ -416,7 +416,7 @@ public:
{ {
return _ChildName.find(name)!=_ChildName.end(); return _ChildName.find(name)!=_ChildName.end();
} }
void serial(NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
private: private:
static TFlagBorder getComplementaryBorder (TFlagBorder border); static TFlagBorder getComplementaryBorder (TFlagBorder border);
@ -629,7 +629,7 @@ public:
/// Postfix tile vegetable desc /// Postfix tile vegetable desc
void postfixTileVegetableDesc (const char *filename); void postfixTileVegetableDesc (const char *filename);
void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
private: private:
sint createTile (); sint createTile ();
void freeTile (int tileIndex); void freeTile (int tileIndex);

4
code/nel/include/nel/3d/tile_far_bank.h
View file

@ -94,7 +94,7 @@ public:
} }
/// Serial this tile /// Serial this tile
void serial (class NLMISC::IStream &f) throw(NLMISC::EStream); void serial (NLMISC::IStream &f);
private: private:
/// RGBA Pixels vector /// RGBA Pixels vector
@ -141,7 +141,7 @@ public:
} }
/// Serial this bank /// Serial this bank
void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
/// The far tile vector /// The far tile vector
std::vector<CTileFar> _TileVector; std::vector<CTileFar> _TileVector;

2
code/nel/include/nel/3d/water_height_map.h
View file

@ -168,7 +168,7 @@ public:
sint64 Date; sint64 Date;
/// serial the pools data's /// serial the pools data's
void serial(NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
/// Set this pool name. /// Set this pool name.
void setName(const std::string &name) { _Name = name; } void setName(const std::string &name) { _Name = name; }

2
code/nel/include/nel/3d/water_pool_manager.h
View file

@ -97,7 +97,7 @@ public:
/// serial the pools data's /// serial the pools data's
void serial(NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
private: private:
friend class CWaterShape; friend class CWaterShape;

4
code/nel/include/nel/3d/water_shape.h
View file

@ -108,7 +108,7 @@ public:
/// serial this shape /// serial this shape
void serial(NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
//@} //@}
@ -299,7 +299,7 @@ public:
/// serial this shape /// serial this shape
void serial(NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
//@} //@}

8
code/nel/include/nel/logic/logic_condition.h
View file

@ -79,7 +79,7 @@ public:
/** /**
* serial * serial
*/ */
//void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); //void serial(NLMISC::IStream &f);
void write (xmlNodePtr node) const; void write (xmlNodePtr node) const;
void read (xmlNodePtr node); void read (xmlNodePtr node);
@ -160,7 +160,7 @@ public:
/** /**
* serial * serial
*/ */
//void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); //void serial(NLMISC::IStream &f);
void write (xmlNodePtr node) const; void write (xmlNodePtr node) const;
void read (xmlNodePtr node); void read (xmlNodePtr node);
@ -239,7 +239,7 @@ public:
/** /**
* serial * serial
*/ */
//void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); //void serial(NLMISC::IStream &f);
/** /**
* Destructor * Destructor
@ -323,7 +323,7 @@ public:
/** /**
* serial * serial
*/ */
//void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); //void serial(NLMISC::IStream &f);
void write (xmlNodePtr node) const; void write (xmlNodePtr node) const;
void read (xmlNodePtr node); void read (xmlNodePtr node);

6
code/nel/include/nel/logic/logic_event.h
View file

@ -79,7 +79,7 @@ public:
/** /**
* serial * serial
*/ */
//void serial(NLMISC::IStream &f) throw(NLMISC::EStream); //void serial(NLMISC::IStream &f);
void write (xmlNodePtr node, const char *subName = "") const; void write (xmlNodePtr node, const char *subName = "") const;
void read (xmlNodePtr node, const char *subName = ""); void read (xmlNodePtr node, const char *subName = "");
@ -122,7 +122,7 @@ public:
/** /**
* serial * serial
*/ */
//void serial(NLMISC::IStream &f) throw(NLMISC::EStream); //void serial(NLMISC::IStream &f);
void write (xmlNodePtr node) const; void write (xmlNodePtr node) const;
void read (xmlNodePtr node); void read (xmlNodePtr node);
@ -181,7 +181,7 @@ public:
/** /**
* serial * serial
*/ */
//void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); //void serial(NLMISC::IStream &f);
void write (xmlNodePtr node) const; void write (xmlNodePtr node) const;
void read (xmlNodePtr node); void read (xmlNodePtr node);

2
code/nel/include/nel/logic/logic_state.h
View file

@ -149,7 +149,7 @@ public:
/** /**
* serial * serial
*/ */
//void serial(NLMISC::IStream &f) throw(NLMISC::EStream); //void serial(NLMISC::IStream &f);
void write (xmlNodePtr node) const; void write (xmlNodePtr node) const;
void read (xmlNodePtr node); void read (xmlNodePtr node);

2
code/nel/include/nel/logic/logic_state_machine.h
View file

@ -182,7 +182,7 @@ public:
/** /**
* serial * serial
*/ */
//void serial( NLMISC::IStream &f ) throw(NLMISC::EStream); //void serial( NLMISC::IStream &f );
/** /**
* Display the variables * Display the variables

4
code/nel/include/nel/logic/logic_variable.h
View file

@ -104,7 +104,7 @@ public:
/** /**
* serial * serial
*/ */
//virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream); //virtual void serial(NLMISC::IStream &f);
virtual void write (xmlNodePtr node) const; virtual void write (xmlNodePtr node) const;
virtual void read (xmlNodePtr node); virtual void read (xmlNodePtr node);
@ -186,7 +186,7 @@ public:
/** /**
* serial * serial
*/ */
//void serial(NLMISC::IStream &f) throw(NLMISC::EStream); //void serial(NLMISC::IStream &f);
virtual void write (xmlNodePtr node) const; virtual void write (xmlNodePtr node) const;
virtual void read (xmlNodePtr node); virtual void read (xmlNodePtr node);

4
code/nel/include/nel/misc/array_2d.h
View file

@ -132,7 +132,7 @@ public:
// See which parts of array will be discarded if the array is displaced by the given offset // See which parts of array will be discarded if the array is displaced by the given offset
void getDiscardRects(sint moveOffsetX, sint moveOffsetY, std::vector<NLMISC::CRect> &discardedRects); void getDiscardRects(sint moveOffsetX, sint moveOffsetY, std::vector<NLMISC::CRect> &discardedRects);
// //
void serial(NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
private: private:
TArrayContainer _Array; TArrayContainer _Array;
uint _Width; uint _Width;
@ -157,7 +157,7 @@ void CArray2D<T>::clear()
//********************************************************************************* //*********************************************************************************
template <class T> template <class T>
void CArray2D<T>::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CArray2D<T>::serial(NLMISC::IStream &f)
{ {
f.serialCont(_Array); f.serialCont(_Array);
uint32 width = _Width; uint32 width = _Width;

4
code/nel/include/nel/misc/polygon.h
View file

@ -66,7 +66,7 @@ public:
float computeArea() const; float computeArea() const;
/// Serial this polygon /// Serial this polygon
void serial(NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
/** /**
* Convert a concave polygon into a list of convex polygons using a 2d projection. * Convert a concave polygon into a list of convex polygons using a 2d projection.
@ -156,7 +156,7 @@ public:
void getBestTriplet(uint &index0, uint &index1, uint &index2); void getBestTriplet(uint &index0, uint &index1, uint &index2);
/// Serial this polygon /// Serial this polygon
void serial(NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
typedef std::pair<sint, sint> TRaster; typedef std::pair<sint, sint> TRaster;
typedef std::vector<TRaster> TRasterVect; typedef std::vector<TRaster> TRasterVect;

6
code/nel/include/nel/misc/rgba.h
View file

@ -86,7 +86,7 @@ public:
* Serialisation. * Serialisation.
* \param f Stream used for serialisation. * \param f Stream used for serialisation.
*/ */
void serial (class NLMISC::IStream &f); void serial (NLMISC::IStream &f);
/** /**
* Blend two colors. * Blend two colors.
@ -451,7 +451,7 @@ public:
* Serialisation. * Serialisation.
* \param f Stream used for serialisation. * \param f Stream used for serialisation.
*/ */
void serial(class NLMISC::IStream &f); void serial(NLMISC::IStream &f);
/** /**
* Blend two colors. * Blend two colors.
@ -676,7 +676,7 @@ public:
* Serialisation. * Serialisation.
* \param f Stream used for serialisation. * \param f Stream used for serialisation.
*/ */
void serial(class NLMISC::IStream &f); void serial(NLMISC::IStream &f);
/** /**
* Set colors. * Set colors.

4
code/nel/include/nel/misc/sheet_id.h
View file

@ -146,8 +146,8 @@ public :
/** /**
* Serial * Serial
*/ */
void serial(NLMISC::IStream &f) throw(NLMISC::EStream); void serial(NLMISC::IStream &f);
void serialString(NLMISC::IStream &f, const std::string &defaultType = "") throw(NLMISC::EStream); void serialString(NLMISC::IStream &f, const std::string &defaultType = "");
/** /**
* Display the list of valid sheet ids with their associated file names * Display the list of valid sheet ids with their associated file names

2
code/nel/src/3d/flare_shape.cpp
View file

@ -63,7 +63,7 @@ CFlareShape::CFlareShape() : _Color(NLMISC::CRGBA::White),
// *************************************************************************************************************** // ***************************************************************************************************************
void CFlareShape::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CFlareShape::serial(NLMISC::IStream &f)
{ {
// Version 4 : - added occlusion test mesh, size reduction, angle modification when object is occluded // Version 4 : - added occlusion test mesh, size reduction, angle modification when object is occluded
// - added lookat mode for first flare // - added lookat mode for first flare

2
code/nel/src/3d/landscape.cpp
View file

@ -139,7 +139,7 @@ public:
} }
// Dummy serial... // Dummy serial...
virtual void serial(NLMISC::IStream &/* f */) throw(NLMISC::EStream) {nlstop;} virtual void serial(NLMISC::IStream &/* f */) { nlstop; }
NLMISC_DECLARE_CLASS(CTextureCross); NLMISC_DECLARE_CLASS(CTextureCross);
}; };

12
code/nel/src/3d/mesh.cpp
View file

@ -861,7 +861,7 @@ void CMeshGeom::renderSimpleWithMaterial(IDriver *drv, const CMatrix &worldMatri
// *************************************************************************** // ***************************************************************************
void CMeshGeom::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CMeshGeom::serial(NLMISC::IStream &f)
{ {
/* *********************************************** /* ***********************************************
* WARNING: This Class/Method must be thread-safe (ctor/dtor/serial): no static access for instance * WARNING: This Class/Method must be thread-safe (ctor/dtor/serial): no static access for instance
@ -2389,7 +2389,7 @@ CMesh::CCorner::CCorner()
// *************************************************************************** // ***************************************************************************
void CMesh::CCorner::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CMesh::CCorner::serial(NLMISC::IStream &f)
{ {
nlassert(0); // not used nlassert(0); // not used
f.serial(Vertex); f.serial(Vertex);
@ -2400,7 +2400,7 @@ void CMesh::CCorner::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
} }
// *************************************************************************** // ***************************************************************************
void CMesh::CFace::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CMesh::CFace::serial(NLMISC::IStream &f)
{ {
for(int i=0;i<3;++i) for(int i=0;i<3;++i)
f.serial(Corner[i]); f.serial(Corner[i]);
@ -2409,7 +2409,7 @@ void CMesh::CFace::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
} }
// *************************************************************************** // ***************************************************************************
void CMesh::CSkinWeight::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CMesh::CSkinWeight::serial(NLMISC::IStream &f)
{ {
for(int i=0;i<NL3D_MESH_SKINNING_MAX_MATRIX;++i) for(int i=0;i<NL3D_MESH_SKINNING_MAX_MATRIX;++i)
{ {
@ -2420,7 +2420,7 @@ void CMesh::CSkinWeight::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
// *************************************************************************** // ***************************************************************************
/* Serialization is not used. /* Serialization is not used.
void CMesh::CMeshBuild::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CMesh::CMeshBuild::serial(NLMISC::IStream &f)
{ {
sint ver= f.serialVersion(0); sint ver= f.serialVersion(0);
@ -2604,7 +2604,7 @@ void CMesh::render(IDriver *drv, CTransformShape *trans, bool passOpaque)
// *************************************************************************** // ***************************************************************************
void CMesh::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CMesh::serial(NLMISC::IStream &f)
{ {
/* *********************************************** /* ***********************************************
* WARNING: This Class/Method must be thread-safe (ctor/dtor/serial): no static access for instance * WARNING: This Class/Method must be thread-safe (ctor/dtor/serial): no static access for instance

4
code/nel/src/3d/mesh_base.cpp
View file

@ -139,7 +139,7 @@ CMeshBase::CMeshBaseBuild::CMeshBaseBuild()
// *************************************************************************** // ***************************************************************************
#if 0 #if 0
void CMeshBase::CMeshBaseBuild::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CMeshBase::CMeshBaseBuild::serial(NLMISC::IStream &f)
{ {
/* /*
Version 1: Version 1:
@ -164,7 +164,7 @@ void CMeshBase::CMeshBaseBuild::serial(NLMISC::IStream &f) throw(NLMISC::EStream
#endif #endif
// *************************************************************************** // ***************************************************************************
void CMeshBase::serialMeshBase(NLMISC::IStream &f) throw(NLMISC::EStream) void CMeshBase::serialMeshBase(NLMISC::IStream &f)
{ {
/* *********************************************** /* ***********************************************
* WARNING: This Class/Method must be thread-safe (ctor/dtor/serial): no static access for instance * WARNING: This Class/Method must be thread-safe (ctor/dtor/serial): no static access for instance

4
code/nel/src/3d/mesh_morpher.cpp
View file

@ -32,7 +32,7 @@ namespace NL3D
{ {
// *************************************************************************** // ***************************************************************************
void CBlendShape::serial (NLMISC::IStream &f) throw(NLMISC::EStream) void CBlendShape::serial (NLMISC::IStream &f)
{ {
/* *********************************************** /* ***********************************************
* WARNING: This Class/Method must be thread-safe (ctor/dtor/serial): no static access for instance * WARNING: This Class/Method must be thread-safe (ctor/dtor/serial): no static access for instance
@ -345,7 +345,7 @@ void CMeshMorpher::updateSkinned (std::vector<CAnimatedMorph> *pBSFactor)
} }
// *************************************************************************** // ***************************************************************************
void CMeshMorpher::serial (NLMISC::IStream &f) throw(NLMISC::EStream) void CMeshMorpher::serial (NLMISC::IStream &f)
{ {
/* *********************************************** /* ***********************************************
* WARNING: This Class/Method must be thread-safe (ctor/dtor/serial): no static access for instance * WARNING: This Class/Method must be thread-safe (ctor/dtor/serial): no static access for instance

10
code/nel/src/3d/mesh_mrm.cpp
View file

@ -1604,7 +1604,7 @@ void CMeshMRMGeom::updateShiftedTriangleCache(CMeshMRMInstance *mi, sint curLodI
// *************************************************************************** // ***************************************************************************
void CMeshMRMGeom::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CMeshMRMGeom::serial(NLMISC::IStream &f)
{ {
// because of complexity, serial is separated in save / load. // because of complexity, serial is separated in save / load.
@ -1618,7 +1618,7 @@ void CMeshMRMGeom::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
// *************************************************************************** // ***************************************************************************
sint CMeshMRMGeom::loadHeader(NLMISC::IStream &f) throw(NLMISC::EStream) sint CMeshMRMGeom::loadHeader(NLMISC::IStream &f)
{ {
/* /*
Version 5: Version 5:
@ -1748,7 +1748,7 @@ sint CMeshMRMGeom::loadHeader(NLMISC::IStream &f) throw(NLMISC::EStream)
// *************************************************************************** // ***************************************************************************
void CMeshMRMGeom::load(NLMISC::IStream &f) throw(NLMISC::EStream) void CMeshMRMGeom::load(NLMISC::IStream &f)
{ {
// Load the header of the stream. // Load the header of the stream.
// ================== // ==================
@ -1778,7 +1778,7 @@ void CMeshMRMGeom::load(NLMISC::IStream &f) throw(NLMISC::EStream)
// *************************************************************************** // ***************************************************************************
void CMeshMRMGeom::save(NLMISC::IStream &f) throw(NLMISC::EStream) void CMeshMRMGeom::save(NLMISC::IStream &f)
{ {
/* /*
Version 5: Version 5:
@ -2968,7 +2968,7 @@ void CMeshMRM::render(IDriver *drv, CTransformShape *trans, bool passOpaque)
// *************************************************************************** // ***************************************************************************
void CMeshMRM::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CMeshMRM::serial(NLMISC::IStream &f)
{ {
/* /*
Version 0: Version 0:

4
code/nel/src/3d/mesh_multi_lod.cpp
View file

@ -288,7 +288,7 @@ void CMeshMultiLod::render(IDriver *drv, CTransformShape *trans, bool passOpaque
// *************************************************************************** // ***************************************************************************
void CMeshMultiLod::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CMeshMultiLod::serial(NLMISC::IStream &f)
{ {
/* *********************************************** /* ***********************************************
* WARNING: This Class/Method must be thread-safe (ctor/dtor/serial): no static access for instance * WARNING: This Class/Method must be thread-safe (ctor/dtor/serial): no static access for instance
@ -405,7 +405,7 @@ void CMeshMultiLod::clear ()
// *************************************************************************** // ***************************************************************************
void CMeshMultiLod::CMeshSlot::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CMeshMultiLod::CMeshSlot::serial(NLMISC::IStream &f)
{ {
// Check version // Check version
(void)f.serialVersion (0); (void)f.serialVersion (0);

2
code/nel/src/3d/meshvp_per_pixel_light.cpp
View file

@ -573,7 +573,7 @@ void CMeshVPPerPixelLight::end(IDriver *drv)
//================================================================================= //=================================================================================
void CMeshVPPerPixelLight::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CMeshVPPerPixelLight::serial(NLMISC::IStream &f)
{ {
(void)f.serialVersion(0); (void)f.serialVersion(0);
f.serial(SpecularLighting); f.serial(SpecularLighting);

2
code/nel/src/3d/meshvp_wind_tree.cpp
View file

@ -194,7 +194,7 @@ CMeshVPWindTree::~CMeshVPWindTree()
// *************************************************************************** // ***************************************************************************
void CMeshVPWindTree::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CMeshVPWindTree::serial(NLMISC::IStream &f)
{ {
(void)f.serialVersion(0); (void)f.serialVersion(0);

4
code/nel/src/3d/packed_world.cpp
View file

@ -153,7 +153,7 @@ void CPackedWorld::getZones(std::vector<TPackedZoneBaseSPtr> &zones)
} }
// ************************************************************************************************* // *************************************************************************************************
void CPackedWorld::serialZoneNames(NLMISC::IStream &f) throw(NLMISC::EStream) void CPackedWorld::serialZoneNames(NLMISC::IStream &f)
{ {
f.serialVersion(1); f.serialVersion(1);
f.serialCheck(NELID("OWPA")); f.serialCheck(NELID("OWPA"));
@ -161,7 +161,7 @@ void CPackedWorld::serialZoneNames(NLMISC::IStream &f) throw(NLMISC::EStream)
} }
// ************************************************************************************************* // *************************************************************************************************
void CPackedWorld::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPackedWorld::serial(NLMISC::IStream &f)
{ {
serialZoneNames(f); serialZoneNames(f);
f.serialCont(_Zones); f.serialCont(_Zones);

2
code/nel/src/3d/particle_system.cpp
View file

@ -752,7 +752,7 @@ void CParticleSystem::step(TPass pass, TAnimationTime ellapsedTime, CParticleSys
///======================================================================================= ///=======================================================================================
void CParticleSystem::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CParticleSystem::serial(NLMISC::IStream &f)
{ {
CHECK_INTEGRITY CHECK_INTEGRITY
NL_PS_FUNC_MAIN(CParticleSystem_serial) NL_PS_FUNC_MAIN(CParticleSystem_serial)

2
code/nel/src/3d/particle_system_process.cpp
View file

@ -129,7 +129,7 @@ const CFontManager *CParticleSystemProcess::getFontManager(void) const
// *********************************************************************************************************** // ***********************************************************************************************************
void CParticleSystemProcess::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CParticleSystemProcess::serial(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CParticleSystemProcess_serial) NL_PS_FUNC(CParticleSystemProcess_serial)
// version 2 : added matrix mode (just not fx world matrix or identity) // version 2 : added matrix mode (just not fx world matrix or identity)

2
code/nel/src/3d/particle_system_shape.cpp
View file

@ -117,7 +117,7 @@ CParticleSystemShape::CParticleSystemShape() : _MaxViewDist(100.f),
} }
///=========================================================================== ///===========================================================================
void CParticleSystemShape::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CParticleSystemShape::serial(NLMISC::IStream &f)
{ {
/* *********************************************** /* ***********************************************
* WARNING: This Class/Method must be thread-safe (ctor/dtor/serial): no static access for instance * WARNING: This Class/Method must be thread-safe (ctor/dtor/serial): no static access for instance

6
code/nel/src/3d/ps_attrib_maker_helper.cpp
View file

@ -26,7 +26,7 @@ namespace NL3D
// *********************************************************************************** // ***********************************************************************************
void CPSAttribMakerMemory<uint32>::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSAttribMakerMemory<uint32>::serial(NLMISC::IStream &f)
{ {
CPSAttribMakerMemoryBase<uint32>::serial(f); CPSAttribMakerMemoryBase<uint32>::serial(f);
if (f.isReading()) if (f.isReading())
@ -59,7 +59,7 @@ void CPSAttribMakerMemory<uint32>::newElement(const CPSEmitterInfo &info)
} }
// *********************************************************************************** // ***********************************************************************************
void CPSAttribMakerMemory<sint32>::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSAttribMakerMemory<sint32>::serial(NLMISC::IStream &f)
{ {
CPSAttribMakerMemoryBase<sint32>::serial(f); CPSAttribMakerMemoryBase<sint32>::serial(f);
if (f.isReading()) if (f.isReading())
@ -92,7 +92,7 @@ void CPSAttribMakerMemory<sint32>::newElement(const CPSEmitterInfo &info)
} }
// *********************************************************************************** // ***********************************************************************************
void CPSAttribMakerMemory<float>::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSAttribMakerMemory<float>::serial(NLMISC::IStream &f)
{ {
CPSAttribMakerMemoryBase<float>::serial(f); CPSAttribMakerMemoryBase<float>::serial(f);
if (f.isReading()) if (f.isReading())

4
code/nel/src/3d/ps_color.cpp
View file

@ -76,7 +76,7 @@ NLMISC::CRGBA CPSColorMemory::getDefaultValue(void) const
} }
///====================================================================================== ///======================================================================================
void CPSColorMemory::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSColorMemory::serial(NLMISC::IStream &f)
{ {
setColorType(CVertexBuffer::TRGBA); setColorType(CVertexBuffer::TRGBA);
CPSAttribMakerMemory<NLMISC::CRGBA>::serial(f); CPSAttribMakerMemory<NLMISC::CRGBA>::serial(f);
@ -90,7 +90,7 @@ void CPSColorBinOp::setColorType(CVertexBuffer::TVertexColorType colorType)
} }
///====================================================================================== ///======================================================================================
void CPSColorBinOp::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSColorBinOp::serial(NLMISC::IStream &f)
{ {
setColorType(CVertexBuffer::TRGBA); setColorType(CVertexBuffer::TRGBA);
CPSAttribMakerBinOp<NLMISC::CRGBA>::serial(f); CPSAttribMakerBinOp<NLMISC::CRGBA>::serial(f);

2
code/nel/src/3d/ps_dot.cpp
View file

@ -290,7 +290,7 @@ void CPSDot::resize(uint32 size)
} }
///=================================================================== ///===================================================================
void CPSDot::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSDot::serial(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSDot_IStream ) NL_PS_FUNC(CPSDot_IStream )

16
code/nel/src/3d/ps_emitter.cpp
View file

@ -1917,7 +1917,7 @@ void CPSEmitter::bounceOccurred(uint32 index, TAnimationTime timeToNextSimStep)
} }
///========================================================================== ///==========================================================================
void CPSEmitter::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSEmitter::serial(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSEmitter_serial) NL_PS_FUNC(CPSEmitter_serial)
/// version 6 : the flag _EmitDirBasis no longer exist, it has been replaced by _UserMatrixModeForEmissionDirection /// version 6 : the flag _EmitDirBasis no longer exist, it has been replaced by _UserMatrixModeForEmissionDirection
@ -2184,7 +2184,7 @@ bool CPSEmitter::testEmitForever() const
// implementation of CPSModulatedEmitter // // implementation of CPSModulatedEmitter //
//////////////////////////////////////////// ////////////////////////////////////////////
void CPSModulatedEmitter::serialEmitteeSpeedScheme(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSModulatedEmitter::serialEmitteeSpeedScheme(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSModulatedEmitter_IStream ) NL_PS_FUNC(CPSModulatedEmitter_IStream )
bool useScheme; bool useScheme;
@ -2228,7 +2228,7 @@ void CPSEmitterOmni::emit(const NLMISC::CVector &srcPos, uint32 index, CVector &
} }
///========================================================================== ///==========================================================================
void CPSEmitterOmni::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSEmitterOmni::serial(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSEmitterOmni_serial) NL_PS_FUNC(CPSEmitterOmni_serial)
f.serialVersion(1); f.serialVersion(1);
@ -2332,7 +2332,7 @@ void CPSEmitterDirectionnal::resize(uint32 capacity)
} }
///========================================================================== ///==========================================================================
void CPSEmitterDirectionnal::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSEmitterDirectionnal::serial(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSEmitterDirectionnal_IStream ) NL_PS_FUNC(CPSEmitterDirectionnal_IStream )
f.serialVersion(1); f.serialVersion(1);
@ -2346,7 +2346,7 @@ void CPSEmitterDirectionnal::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
//////////////////////////////////////////// ////////////////////////////////////////////
///========================================================================== ///==========================================================================
void CPSEmitterRectangle::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSEmitterRectangle::serial(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSEmitterRectangle_IStream ) NL_PS_FUNC(CPSEmitterRectangle_IStream )
f.serialVersion(1); f.serialVersion(1);
@ -2506,7 +2506,7 @@ void CPSEmitterRectangle::showTool(void)
//////////////////////////////////// ////////////////////////////////////
///========================================================================== ///==========================================================================
void CPSEmitterConic::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSEmitterConic::serial(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSEmitterConic_serial) NL_PS_FUNC(CPSEmitterConic_serial)
f.serialVersion(1); f.serialVersion(1);
@ -2611,7 +2611,7 @@ CMatrix CPSSphericalEmitter::getMatrix(uint32 index) const
} }
///========================================================================== ///==========================================================================
void CPSSphericalEmitter::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSSphericalEmitter::serial(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSSphericalEmitter_serial) NL_PS_FUNC(CPSSphericalEmitter_serial)
f.serialVersion(1); f.serialVersion(1);
@ -2668,7 +2668,7 @@ void CPSSphericalEmitter::resize(uint32 size)
///////////////////////////////////// /////////////////////////////////////
///========================================================================== ///==========================================================================
void CPSRadialEmitter::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSRadialEmitter::serial(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSRadialEmitter_serial) NL_PS_FUNC(CPSRadialEmitter_serial)
f.serialVersion(1); f.serialVersion(1);

2
code/nel/src/3d/ps_face.cpp
View file

@ -293,7 +293,7 @@ void CPSFace::step(TPSProcessPass pass)
///====================================================================================== ///======================================================================================
void CPSFace::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSFace::serial(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSFace_IStream ) NL_PS_FUNC(CPSFace_IStream )
f.serialVersion(1); f.serialVersion(1);

2
code/nel/src/3d/ps_face_look_at.cpp
View file

@ -996,7 +996,7 @@ void CPSFaceLookAt::resize(uint32 capacity)
///=========================================================================================== ///===========================================================================================
void CPSFaceLookAt::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSFaceLookAt::serial(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSFaceLookAt_serial) NL_PS_FUNC(CPSFaceLookAt_serial)
// version 4 : added 'align on z-axis' flag // version 4 : added 'align on z-axis' flag

2
code/nel/src/3d/ps_fan_light.cpp
View file

@ -393,7 +393,7 @@ void CPSFanLight::draw(bool opaque)
} }
///==================================================================================== ///====================================================================================
void CPSFanLight::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSFanLight::serial(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSFanLight_serial) NL_PS_FUNC(CPSFanLight_serial)
sint ver = f.serialVersion(2); sint ver = f.serialVersion(2);

2
code/nel/src/3d/ps_float.cpp
View file

@ -151,7 +151,7 @@ void CPSFloatCurveFunctor::updateTab(void)
} }
///======================================================================================= ///=======================================================================================
void CPSFloatCurveFunctor::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSFloatCurveFunctor::serial(NLMISC::IStream &f)
{ {
f.serialVersion(1); f.serialVersion(1);
f.serial(_NumSamples, _Smoothing); f.serial(_NumSamples, _Smoothing);

20
code/nel/src/3d/ps_force.cpp
View file

@ -45,7 +45,7 @@ CPSForce::CPSForce()
void CPSForce::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSForce::serial(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSForce_serial) NL_PS_FUNC(CPSForce_serial)
f.serialVersion(1); f.serialVersion(1);
@ -189,7 +189,7 @@ void CPSForceIntensity::setIntensityScheme(CPSAttribMaker<float> *scheme)
if (getForceIntensityOwner() && scheme->hasMemory()) scheme->resize(getForceIntensityOwner()->getMaxSize(), getForceIntensityOwner()->getSize()); if (getForceIntensityOwner() && scheme->hasMemory()) scheme->resize(getForceIntensityOwner()->getMaxSize(), getForceIntensityOwner()->getSize());
} }
void CPSForceIntensity::serialForceIntensity(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSForceIntensity::serialForceIntensity(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSForceIntensity_IStream ) NL_PS_FUNC(CPSForceIntensity_IStream )
f.serialVersion(1); f.serialVersion(1);
@ -229,7 +229,7 @@ void CPSForceIntensity::serialForceIntensity(NLMISC::IStream &f) throw(NLMISC::E
//////////////////////////////////////// ////////////////////////////////////////
void CPSForceIntensityHelper::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSForceIntensityHelper::serial(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSForceIntensityHelper_serial) NL_PS_FUNC(CPSForceIntensityHelper_serial)
f.serialVersion(1); f.serialVersion(1);
@ -320,7 +320,7 @@ void CPSDirectionnalForce::show()
} }
} }
void CPSDirectionnalForce::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSDirectionnalForce::serial(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSDirectionnalForce_serial) NL_PS_FUNC(CPSDirectionnalForce_serial)
// Version 2 : added link to a global vector value // Version 2 : added link to a global vector value
@ -488,7 +488,7 @@ void CPSGravity::show()
} }
void CPSGravity::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSGravity::serial(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSGravity_IStream ) NL_PS_FUNC(CPSGravity_IStream )
f.serialVersion(1); f.serialVersion(1);
@ -747,7 +747,7 @@ void CPSCentralGravity::show()
displayIcon2d(tab, tabSize, sSize); displayIcon2d(tab, tabSize, sSize);
} }
void CPSCentralGravity::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSCentralGravity::serial(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSCentralGravity_IStream ) NL_PS_FUNC(CPSCentralGravity_IStream )
f.serialVersion(1); f.serialVersion(1);
@ -785,7 +785,7 @@ void CPSSpring::computeForces(CPSLocated &target)
} }
void CPSSpring::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSSpring::serial(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSSpring_serial) NL_PS_FUNC(CPSSpring_serial)
f.serialVersion(1); f.serialVersion(1);
@ -921,7 +921,7 @@ CMatrix CPSCylindricVortex::getMatrix(uint32 index) const
} }
void CPSCylindricVortex::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSCylindricVortex::serial(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSCylindricVortex_IStream ) NL_PS_FUNC(CPSCylindricVortex_IStream )
f.serialVersion(1); f.serialVersion(1);
@ -960,7 +960,7 @@ void CPSCylindricVortex::resize(uint32 size)
* a magnetic field that has the given direction * a magnetic field that has the given direction
*/ */
void CPSMagneticForce::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSMagneticForce::serial(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSMagneticForce_serial) NL_PS_FUNC(CPSMagneticForce_serial)
f.serialVersion(1); f.serialVersion(1);
@ -1369,7 +1369,7 @@ void CPSBrownianForce::computeForces(CPSLocated &target)
} }
///======================================================================= ///=======================================================================
void CPSBrownianForce::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSBrownianForce::serial(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSBrownianForce_serial) NL_PS_FUNC(CPSBrownianForce_serial)
sint ver = f.serialVersion(3); sint ver = f.serialVersion(3);

2
code/nel/src/3d/ps_light.cpp
View file

@ -72,7 +72,7 @@ CPSLight::~CPSLight()
} }
// *************************************************************************************************************** // ***************************************************************************************************************
void CPSLight::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSLight::serial(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSLight_serial) NL_PS_FUNC(CPSLight_serial)
CPSLocatedBindable::serial(f); CPSLocatedBindable::serial(f);

8
code/nel/src/3d/ps_located.cpp
View file

@ -1411,7 +1411,7 @@ void CPSLocated::resize(uint32 newSize)
class CDummyCollision class CDummyCollision
{ {
public: public:
void serial(NLMISC::IStream &f) throw(NLMISC::EStream) void serial(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CDummyCollision_serial) NL_PS_FUNC(CDummyCollision_serial)
f.serialVersion(1); f.serialVersion(1);
@ -1422,7 +1422,7 @@ public:
}; };
/// *************************************************************************************** /// ***************************************************************************************
void CPSLocated::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSLocated::serial(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSLocated_serial) NL_PS_FUNC(CPSLocated_serial)
@ -2710,7 +2710,7 @@ void CPSLocatedBindable::notifyTargetRemoved(CPSLocated *ptr)
} }
/// *************************************************************************************** /// ***************************************************************************************
void CPSLocatedBindable::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSLocatedBindable::serial(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSLocatedBindable_IStream ) NL_PS_FUNC(CPSLocatedBindable_IStream )
sint ver = f.serialVersion(4); sint ver = f.serialVersion(4);
@ -2902,7 +2902,7 @@ void CPSLocatedBindable::releaseAllRef()
///////////////////////////////////////////// /////////////////////////////////////////////
/// *************************************************************************************** /// ***************************************************************************************
void CPSTargetLocatedBindable::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSTargetLocatedBindable::serial(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSTargetLocatedBindable_serial) NL_PS_FUNC(CPSTargetLocatedBindable_serial)
(void)f.serialVersion(1); (void)f.serialVersion(1);

8
code/nel/src/3d/ps_mesh.cpp
View file

@ -158,7 +158,7 @@ static CMesh *CreateDummyMesh(void)
//==================================================================================== //====================================================================================
void CPSMesh::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSMesh::serial(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSMesh_IStream ) NL_PS_FUNC(CPSMesh_IStream )
(void)f.serialVersion(3); (void)f.serialVersion(3);
@ -1448,7 +1448,7 @@ void CPSConstraintMesh::fillIndexesInPrecompBasis(void)
//==================================================================================== //====================================================================================
/// serialisation. Derivers must override this, and call their parent version /// serialisation. Derivers must override this, and call their parent version
void CPSConstraintMesh::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSConstraintMesh::serial(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSConstraintMesh_IStream ) NL_PS_FUNC(CPSConstraintMesh_IStream )
@ -2267,7 +2267,7 @@ CPSConstraintMesh::CGlobalTexAnim::CGlobalTexAnim() : TransOffset(NLMISC::CVecto
} }
//===================================================================================== //=====================================================================================
void CPSConstraintMesh::CGlobalTexAnim::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSConstraintMesh::CGlobalTexAnim::serial(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CGlobalTexAnim_IStream ) NL_PS_FUNC(CGlobalTexAnim_IStream )
// version 1 : added offset // version 1 : added offset
@ -2365,7 +2365,7 @@ void CPSConstraintMesh::setTexAnimType(TTexAnimType type)
} }
//===================================================================================== //=====================================================================================
void CPSConstraintMesh::CGlobalTexAnims::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSConstraintMesh::CGlobalTexAnims::serial(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CGlobalTexAnims_IStream ) NL_PS_FUNC(CGlobalTexAnims_IStream )
f.serialVersion(0); f.serialVersion(0);

14
code/nel/src/3d/ps_particle_basic.cpp
View file

@ -152,7 +152,7 @@ CPSColoredParticle::~CPSColoredParticle()
} }
//======================================= //=======================================
void CPSColoredParticle::serialColorScheme(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSColoredParticle::serialColorScheme(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSColoredParticle_IStream ) NL_PS_FUNC(CPSColoredParticle_IStream )
f.serialVersion(1); f.serialVersion(1);
@ -213,7 +213,7 @@ CPSSizedParticle::~CPSSizedParticle()
} }
//======================================= //=======================================
void CPSSizedParticle::serialSizeScheme(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSSizedParticle::serialSizeScheme(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSSizedParticle_serialSizeScheme) NL_PS_FUNC(CPSSizedParticle_serialSizeScheme)
f.serialVersion(1); f.serialVersion(1);
@ -277,7 +277,7 @@ CPSRotated2DParticle::~CPSRotated2DParticle()
} }
///=================================================================================== ///===================================================================================
void CPSRotated2DParticle::serialAngle2DScheme(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSRotated2DParticle::serialAngle2DScheme(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSRotated2DParticle_serialAngle2DScheme) NL_PS_FUNC(CPSRotated2DParticle_serialAngle2DScheme)
f.serialVersion(1); f.serialVersion(1);
@ -387,7 +387,7 @@ CPSTexturedParticle::~CPSTexturedParticle()
} }
///=================================================================================== ///===================================================================================
void CPSTexturedParticle::serialTextureScheme(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSTexturedParticle::serialTextureScheme(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSTexturedParticle_serialTextureScheme) NL_PS_FUNC(CPSTexturedParticle_serialTextureScheme)
f.serialVersion(1); f.serialVersion(1);
@ -489,7 +489,7 @@ CPSRotated3DPlaneParticle::~CPSRotated3DPlaneParticle()
} }
///=================================================================================== ///===================================================================================
void CPSRotated3DPlaneParticle::serialPlaneBasisScheme(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSRotated3DPlaneParticle::serialPlaneBasisScheme(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSRotated3DPlaneParticle_serialPlaneBasisScheme) NL_PS_FUNC(CPSRotated3DPlaneParticle_serialPlaneBasisScheme)
f.serialVersion(1); f.serialVersion(1);
@ -515,7 +515,7 @@ CPSMaterial::CPSMaterial()
} }
///=================================================================================== ///===================================================================================
void CPSMaterial::serialMaterial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSMaterial::serialMaterial(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSMaterial_IStream ) NL_PS_FUNC(CPSMaterial_IStream )
// version 3 : added zbias // version 3 : added zbias
@ -726,7 +726,7 @@ void CPSMultiTexturedParticle::enableAlternateTex(bool enabled /*= true*/)
} }
//======================================= //=======================================
void CPSMultiTexturedParticle::serialMultiTex(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSMultiTexturedParticle::serialMultiTex(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSMultiTexturedParticle_serialMultiTex) NL_PS_FUNC(CPSMultiTexturedParticle_serialMultiTex)
/// version 1 : bump factor /// version 1 : bump factor

2
code/nel/src/3d/ps_plane_basis_maker.cpp
View file

@ -320,7 +320,7 @@ uint32 CSpinnerFunctor::getNumSamples(void) const
} }
///============================================================================ ///============================================================================
void CSpinnerFunctor::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CSpinnerFunctor::serial(NLMISC::IStream &f)
{ {
f.serialVersion(1); f.serialVersion(1);
f.serial(_Axis, _NbSamples); f.serial(_Axis, _NbSamples);

2
code/nel/src/3d/ps_quad.cpp
View file

@ -382,7 +382,7 @@ void CPSQuad::updateMatAndVbForColor(void)
} }
//============================================================== //==============================================================
void CPSQuad::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSQuad::serial(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSQuad_serial) NL_PS_FUNC(CPSQuad_serial)
sint ver = f.serialVersion(2); sint ver = f.serialVersion(2);

2
code/nel/src/3d/ps_ribbon.cpp
View file

@ -136,7 +136,7 @@ struct CDummy2DAngle : CPSRotated2DParticle
}; };
///================================================================================================================== ///==================================================================================================================
void CPSRibbon::serial(NLMISC::IStream &f) throw(NLMISC::EStream) void CPSRibbon::serial(NLMISC::IStream &f)
{ {
NL_PS_FUNC(CPSRibbon_serial) NL_PS_FUNC(CPSRibbon_serial)
// Version 3 : - added brace mode // Version 3 : - added brace mode

Some files were not shown because too many files have changed in this diff Show more