forked from 0ad/0ad
Remove trailing whitespace and whitespace in empty lines of source/ except source/third_party/.
This was SVN commit r18987.
This commit is contained in:
parent
b4b4404c64
commit
b18f74da44
@ -85,7 +85,7 @@ public:
|
||||
* Initialises the global state with skeleton data loaded from the
|
||||
* given XML data.
|
||||
* @todo Stop using global state.
|
||||
* @param xmlData
|
||||
* @param xmlData
|
||||
* @param xmlLength
|
||||
* @param xmlErrors output - XML parser error messages; will be non-empty
|
||||
* on failure (and failure will always throw)
|
||||
|
@ -41,7 +41,7 @@ class CCamera
|
||||
public:
|
||||
CCamera();
|
||||
~CCamera();
|
||||
|
||||
|
||||
// Methods for projection
|
||||
void SetProjection(float nearp, float farp, float fov);
|
||||
void SetProjection(const CMatrix3D& matrix) { m_ProjMat = matrix; }
|
||||
@ -80,7 +80,7 @@ class CCamera
|
||||
|
||||
// General helpers that seem to fit here
|
||||
|
||||
// Get the screen-space coordinates corresponding to a given world-space position
|
||||
// Get the screen-space coordinates corresponding to a given world-space position
|
||||
void GetScreenCoordinates(const CVector3D& world, float& x, float& y) const;
|
||||
|
||||
// Get the point on the terrain corresponding to pixel (px,py) (or the mouse coordinates)
|
||||
@ -100,17 +100,17 @@ class CCamera
|
||||
/**
|
||||
* Render: Renders the camera's frustum in world space.
|
||||
* The caller should set the color using glColorXy before calling Render.
|
||||
*
|
||||
*
|
||||
* @param intermediates determines how many intermediate distance planes should
|
||||
* be hinted at between the near and far planes
|
||||
*/
|
||||
void Render(int intermediates = 0) const;
|
||||
|
||||
|
||||
public:
|
||||
// This is the orientation matrix. The inverse of this
|
||||
// is the view matrix
|
||||
CMatrix3D m_Orientation;
|
||||
|
||||
|
||||
// Should not be tweaked externally if possible
|
||||
CMatrix3D m_ProjMat;
|
||||
|
||||
|
@ -56,7 +56,7 @@ struct CinematicSimulationData
|
||||
};
|
||||
|
||||
/**
|
||||
* Class for in game playing of cinematics. Should only be instantiated in CGameView.
|
||||
* Class for in game playing of cinematics. Should only be instantiated in CGameView.
|
||||
*/
|
||||
|
||||
class CCinemaManager
|
||||
@ -73,8 +73,8 @@ public:
|
||||
void AddPath(const CStrW& name, const CCinemaPath& path);
|
||||
|
||||
/**
|
||||
* Adds the path to the playlist
|
||||
* @param name path name
|
||||
* Adds the path to the playlist
|
||||
* @param name path name
|
||||
*/
|
||||
void AddPathToQueue(const CStrW& name);
|
||||
|
||||
@ -89,7 +89,7 @@ public:
|
||||
* @return true if path with that name exists, else false
|
||||
*/
|
||||
bool HasPath(const CStrW& name) const;
|
||||
|
||||
|
||||
const std::map<CStrW, CCinemaPath>& GetAllPaths();
|
||||
void SetAllPaths( const std::map<CStrW, CCinemaPath>& tracks);
|
||||
|
||||
@ -130,7 +130,7 @@ public:
|
||||
bool GetPathsDrawing() const;
|
||||
void SetPathsDrawing(const bool drawPath);
|
||||
|
||||
private:
|
||||
private:
|
||||
bool m_DrawPaths;
|
||||
|
||||
// Cinematic data is accessed from the simulation
|
||||
|
@ -31,7 +31,7 @@ class CCinemaData
|
||||
public:
|
||||
CCinemaData() : m_LookAtTarget(false), m_GrowthCount(0), m_Growth(1), m_Switch(1), m_Timescale(fixed::FromInt(1)) {}
|
||||
virtual ~CCinemaData() {}
|
||||
|
||||
|
||||
const CCinemaData* GetData() const { return this; }
|
||||
|
||||
CStrW m_Name;
|
||||
@ -104,7 +104,7 @@ public:
|
||||
size_t m_CurrentNode;
|
||||
CVector3D m_PreviousRotation;
|
||||
|
||||
public:
|
||||
public:
|
||||
|
||||
/**
|
||||
* Returns false if finished.
|
||||
|
@ -70,9 +70,9 @@ public:
|
||||
CObjectManager& GetObjectManager() const;
|
||||
|
||||
/**
|
||||
* Updates all the view information (i.e. rotate camera, scroll, whatever). This will *not* change any
|
||||
* Updates all the view information (i.e. rotate camera, scroll, whatever). This will *not* change any
|
||||
* World information - only the *presentation*.
|
||||
*
|
||||
*
|
||||
* @param deltaRealTime Elapsed real time since the last frame.
|
||||
*/
|
||||
void Update(const float deltaRealTime);
|
||||
@ -102,7 +102,7 @@ public:
|
||||
float GetNear() const;
|
||||
float GetFar() const;
|
||||
float GetFOV() const;
|
||||
|
||||
|
||||
#define DECLARE_BOOLEAN_SETTING(NAME) \
|
||||
bool Get##NAME##Enabled(); \
|
||||
void Set##NAME##Enabled(bool Enabled);
|
||||
|
@ -34,7 +34,7 @@ public:
|
||||
// constructor; setup data
|
||||
CHFTracer(CTerrain *pTerrain);
|
||||
|
||||
// intersect ray with this heightfield; return true if intersection
|
||||
// intersect ray with this heightfield; return true if intersection
|
||||
// occurs (and fill in grid coordinates and point of intersection), or false otherwise
|
||||
bool RayIntersect(const CVector3D& origin, const CVector3D& dir, int& x, int& z, CVector3D& ipt) const;
|
||||
|
||||
@ -56,9 +56,9 @@ public:
|
||||
static bool PatchRayIntersect(CPatch* patch, const CVector3D& origin, const CVector3D& dir, CVector3D* out);
|
||||
|
||||
private:
|
||||
// test if ray intersects either of the triangles in the given
|
||||
// test if ray intersects either of the triangles in the given
|
||||
bool CellIntersect(int cx, int cz, const CVector3D& origin, const CVector3D& dir, float& dist) const;
|
||||
|
||||
|
||||
// The terrain we're operating on
|
||||
CTerrain *m_pTerrain;
|
||||
// the heightfield were tracing
|
||||
|
@ -93,11 +93,11 @@ private:
|
||||
|
||||
GLuint m_Texture;
|
||||
GLuint m_TextureSmooth1, m_TextureSmooth2;
|
||||
|
||||
|
||||
bool whichTex;
|
||||
|
||||
|
||||
GLuint m_smoothFbo;
|
||||
CShaderTechniquePtr m_smoothShader;
|
||||
CShaderTechniquePtr m_smoothShader;
|
||||
|
||||
ssize_t m_MapSize; // vertexes per side
|
||||
GLsizei m_TextureSize; // texels per side
|
||||
|
@ -73,7 +73,7 @@ public:
|
||||
|
||||
float m_FogFactor;
|
||||
float m_FogMax;
|
||||
|
||||
|
||||
float m_Brightness, m_Contrast, m_Saturation, m_Bloom;
|
||||
|
||||
public:
|
||||
|
@ -54,7 +54,7 @@ public:
|
||||
/**
|
||||
* Get status of the map generator thread
|
||||
*
|
||||
* @return Progress percentage 1-100 if active, 0 when finished, or -1 on error
|
||||
* @return Progress percentage 1-100 if active, 0 when finished, or -1 on error
|
||||
*/
|
||||
int GetProgress();
|
||||
|
||||
@ -97,7 +97,7 @@ public:
|
||||
/**
|
||||
* Get status of the map generator thread
|
||||
*
|
||||
* @return Progress percentage 1-100 if active, 0 when finished, or -1 on error
|
||||
* @return Progress percentage 1-100 if active, 0 when finished, or -1 on error
|
||||
*/
|
||||
int GetProgress();
|
||||
|
||||
@ -108,18 +108,18 @@ public:
|
||||
* @return StructuredClone containing map data
|
||||
*/
|
||||
shared_ptr<ScriptInterface::StructuredClone> GetResults();
|
||||
|
||||
|
||||
private:
|
||||
// Mapgen
|
||||
|
||||
/**
|
||||
* Load all scripts of the given library
|
||||
*
|
||||
*
|
||||
* @param libraryName String specifying name of the library (subfolder of ../maps/random/)
|
||||
* @return true if all scripts ran successfully, false if there's an error
|
||||
*/
|
||||
bool LoadScripts(const std::wstring& libraryName);
|
||||
|
||||
|
||||
// callbacks for script functions
|
||||
static bool LoadLibrary(ScriptInterface::CxPrivate* pCxPrivate, const std::wstring& name);
|
||||
static void ExportMap(ScriptInterface::CxPrivate* pCxPrivate, JS::HandleValue data);
|
||||
|
@ -18,10 +18,10 @@
|
||||
#ifndef INCLUDED_MAPIO
|
||||
#define INCLUDED_MAPIO
|
||||
|
||||
class CMapIO
|
||||
class CMapIO
|
||||
{
|
||||
public:
|
||||
// current file version given to saved maps
|
||||
// current file version given to saved maps
|
||||
enum { FILE_VERSION = 6 };
|
||||
// supported file read version - file with version less than this will be reject
|
||||
enum { FILE_READ_VERSION = 6 };
|
||||
|
@ -53,7 +53,7 @@ public:
|
||||
|
||||
// LoadMap: try to load the map from given file; reinitialise the scene to new data if successful
|
||||
void LoadMap(const VfsPath& pathname, JSRuntime* rt, JS::HandleValue settings, CTerrain*, WaterManager*, SkyManager*, CLightEnv*, CGameView*,
|
||||
CCinemaManager*, CTriggerManager*, CPostprocManager* pPostproc, CSimulation2*, const CSimContext*,
|
||||
CCinemaManager*, CTriggerManager*, CPostprocManager* pPostproc, CSimulation2*, const CSimContext*,
|
||||
int playerID, bool skipEntities);
|
||||
|
||||
void LoadRandomMap(const CStrW& scriptFile, JSRuntime* rt, JS::HandleValue settings, CTerrain*, WaterManager*, SkyManager*, CLightEnv*, CGameView*, CCinemaManager*, CTriggerManager*, CPostprocManager* pPostproc_, CSimulation2*, int playerID);
|
||||
@ -88,7 +88,7 @@ private:
|
||||
|
||||
// clean up everything used during delayed load
|
||||
int DelayLoadFinished();
|
||||
|
||||
|
||||
// Copy random map settings over to sim
|
||||
int LoadRMSettings();
|
||||
|
||||
@ -108,7 +108,7 @@ private:
|
||||
int ParseCamera();
|
||||
|
||||
|
||||
// size of map
|
||||
// size of map
|
||||
ssize_t m_PatchesPerSide;
|
||||
// heightmap for map
|
||||
std::vector<u16> m_Heightmap;
|
||||
|
@ -45,8 +45,8 @@ public:
|
||||
CMapWriter();
|
||||
// SaveMap: try to save the current map to the given file
|
||||
void SaveMap(const VfsPath& pathname, CTerrain* pTerr,
|
||||
WaterManager* pWaterMan, SkyManager* pSkyMan,
|
||||
CLightEnv* pLightEnv, CCamera* pCamera,
|
||||
WaterManager* pWaterMan, SkyManager* pSkyMan,
|
||||
CLightEnv* pLightEnv, CCamera* pCamera,
|
||||
CCinemaManager* pCinema, CPostprocManager* pPostproc,
|
||||
CSimulation2* pSimulation2);
|
||||
|
||||
@ -56,14 +56,14 @@ private:
|
||||
// PackTerrain: pack the terrain onto the end of the data stream
|
||||
void PackTerrain(CFilePacker& packer, CTerrain* pTerrain);
|
||||
|
||||
// EnumTerrainTextures: build lists of textures used by map, and indices into this list
|
||||
// EnumTerrainTextures: build lists of textures used by map, and indices into this list
|
||||
// for each tile on the terrain
|
||||
void EnumTerrainTextures(CTerrain* pTerrain, std::vector<CStr>& textures,
|
||||
std::vector<STileDesc>& tileIndices);
|
||||
|
||||
// WriteXML: output some other data (entities, etc) in XML format
|
||||
void WriteXML(const VfsPath& pathname, WaterManager* pWaterMan,
|
||||
SkyManager* pSkyMan, CLightEnv* pLightEnv, CCamera* pCamera,
|
||||
SkyManager* pSkyMan, CLightEnv* pLightEnv, CCamera* pCamera,
|
||||
CCinemaManager* pCinema, CPostprocManager* pPostproc,
|
||||
CSimulation2* pSimulation2);
|
||||
};
|
||||
|
@ -28,18 +28,18 @@
|
||||
class CMaterial
|
||||
{
|
||||
public:
|
||||
|
||||
|
||||
struct TextureSampler
|
||||
{
|
||||
TextureSampler(const CStr &n, CTexturePtr t) : Name(n), Sampler(t) {}
|
||||
TextureSampler(const CStrIntern &n, CTexturePtr t) : Name(n), Sampler(t) {}
|
||||
|
||||
|
||||
CStrIntern Name;
|
||||
CTexturePtr Sampler;
|
||||
};
|
||||
|
||||
|
||||
typedef std::vector<TextureSampler> SamplersVector;
|
||||
|
||||
|
||||
CMaterial();
|
||||
|
||||
// Whether this material's shaders use alpha blending, in which case
|
||||
@ -60,7 +60,7 @@ public:
|
||||
// GetConditionalDefines() list are currently matching.
|
||||
// Use 0 if you don't care about conditional defines.
|
||||
const CShaderDefines& GetShaderDefines(uint32_t conditionFlags) const { return m_CombinedShaderDefines.at(conditionFlags); }
|
||||
|
||||
|
||||
// Must call RecomputeCombinedShaderDefines after this, before rendering with this material
|
||||
void AddConditionalDefine(const char* defname, const char* defvalue, int type, std::vector<float> &args);
|
||||
|
||||
@ -71,7 +71,7 @@ public:
|
||||
|
||||
void AddSampler(const TextureSampler& texture);
|
||||
const SamplersVector& GetSamplers() const { return m_Samplers; }
|
||||
|
||||
|
||||
void AddRenderQuery(const char* key);
|
||||
const CShaderRenderQueries& GetRenderQueries() const { return m_RenderQueries; }
|
||||
|
||||
@ -82,14 +82,14 @@ public:
|
||||
void RecomputeCombinedShaderDefines();
|
||||
|
||||
private:
|
||||
|
||||
// This pointer is kept to make it easier for the fixed pipeline to
|
||||
|
||||
// This pointer is kept to make it easier for the fixed pipeline to
|
||||
// access the only texture it's interested in.
|
||||
CTexturePtr m_DiffuseTexture;
|
||||
|
||||
|
||||
SamplersVector m_Samplers;
|
||||
std::vector<CStrIntern> m_RequiredSamplers;
|
||||
|
||||
|
||||
CStrIntern m_ShaderEffect;
|
||||
CShaderDefines m_ShaderDefines;
|
||||
CShaderConditionalDefines m_ConditionalDefines;
|
||||
|
@ -43,7 +43,7 @@ class CSimulation2;
|
||||
#define MODELFLAG_IGNORE_LOS (1<<4)
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// CModel: basically, a mesh object - holds the texturing and skinning
|
||||
// CModel: basically, a mesh object - holds the texturing and skinning
|
||||
// information for a model in game
|
||||
class CModel : public CModelAbstract
|
||||
{
|
||||
@ -58,7 +58,7 @@ public:
|
||||
float m_MaxHeight;
|
||||
|
||||
/**
|
||||
* Location of the prop point within its parent model, relative to either a bone in the parent model or to the
|
||||
* Location of the prop point within its parent model, relative to either a bone in the parent model or to the
|
||||
* parent model's origin. See the documentation for @ref SPropPoint for more details.
|
||||
* @see SPropPoint
|
||||
*/
|
||||
@ -161,13 +161,13 @@ public:
|
||||
|
||||
virtual const CBoundingBoxAligned GetWorldBoundsRec(); // reimplemented here
|
||||
|
||||
/// Auxiliary method; calculates object space bounds of this model, based solely on vertex positions, and stores
|
||||
/// the result in m_ObjectBounds. Called by CalcBounds (instead of CalcAnimatedObjectBounds) if it has been determined
|
||||
/// Auxiliary method; calculates object space bounds of this model, based solely on vertex positions, and stores
|
||||
/// the result in m_ObjectBounds. Called by CalcBounds (instead of CalcAnimatedObjectBounds) if it has been determined
|
||||
/// that the object-space bounds are static.
|
||||
void CalcStaticObjectBounds();
|
||||
|
||||
/// Auxiliary method; calculate object-space bounds encompassing all vertex positions for given animation, and stores
|
||||
/// the result in m_ObjectBounds. Called by CalcBounds (instead of CalcStaticBounds) if it has been determined that the
|
||||
|
||||
/// Auxiliary method; calculate object-space bounds encompassing all vertex positions for given animation, and stores
|
||||
/// the result in m_ObjectBounds. Called by CalcBounds (instead of CalcStaticBounds) if it has been determined that the
|
||||
/// object-space bounds need to take animations into account.
|
||||
void CalcAnimatedObjectBounds(CSkeletonAnimDef* anim,CBoundingBoxAligned& result);
|
||||
|
||||
@ -191,7 +191,7 @@ public:
|
||||
bool IsSkinned() { return (m_BoneMatrices != NULL); }
|
||||
|
||||
// return the models bone matrices; 16-byte aligned for SSE reads
|
||||
const CMatrix3D* GetAnimatedBoneMatrices() {
|
||||
const CMatrix3D* GetAnimatedBoneMatrices() {
|
||||
ENSURE(m_PositionValid);
|
||||
return m_BoneMatrices;
|
||||
}
|
||||
@ -201,7 +201,7 @@ public:
|
||||
* animation specific to this model.
|
||||
* @param pathname animation file to load
|
||||
* @param name animation name (e.g. "idle")
|
||||
* @param frequency influences the random choices
|
||||
* @param frequency influences the random choices
|
||||
* @param speed animation speed as a factor of the default animation speed
|
||||
* @param actionpos offset of 'action' event, in range [0, 1]
|
||||
* @param actionpos2 offset of 'action2' event, in range [0, 1]
|
||||
@ -258,7 +258,7 @@ public:
|
||||
private:
|
||||
// delete anything allocated by the model
|
||||
void ReleaseData();
|
||||
|
||||
|
||||
// Needed for terrain aligned props
|
||||
CSimulation2& m_Simulation;
|
||||
|
||||
@ -276,13 +276,13 @@ private:
|
||||
CSkeletonAnim* m_Anim;
|
||||
// time (in MS) into the current animation
|
||||
float m_AnimTime;
|
||||
|
||||
|
||||
/**
|
||||
* Current state of all bones on this model; null if associated modeldef isn't skeletal.
|
||||
* Props may attach to these bones by means of the SPropPoint::m_BoneIndex field; in this case their
|
||||
* transformation matrix held is relative to the bone transformation (see @ref SPropPoint and
|
||||
* transformation matrix held is relative to the bone transformation (see @ref SPropPoint and
|
||||
* @ref CModel::ValidatePosition).
|
||||
*
|
||||
*
|
||||
* @see SPropPoint
|
||||
*/
|
||||
CMatrix3D* m_BoneMatrices;
|
||||
|
@ -40,7 +40,7 @@ class CModelAbstract : public CRenderableObject
|
||||
public:
|
||||
|
||||
/**
|
||||
* Describes a custom selection shape to be used for a model's selection box instead of the default
|
||||
* Describes a custom selection shape to be used for a model's selection box instead of the default
|
||||
* recursive bounding boxes.
|
||||
*/
|
||||
struct CustomSelectionShape
|
||||
@ -59,9 +59,9 @@ public:
|
||||
};
|
||||
|
||||
public:
|
||||
|
||||
|
||||
CModelAbstract()
|
||||
: m_Parent(NULL), m_PositionValid(false), m_ShadingColor(1, 1, 1, 1), m_PlayerID(INVALID_PLAYER),
|
||||
: m_Parent(NULL), m_PositionValid(false), m_ShadingColor(1, 1, 1, 1), m_PlayerID(INVALID_PLAYER),
|
||||
m_SelectionBoxValid(false), m_CustomSelectionShape(NULL)
|
||||
{ }
|
||||
|
||||
@ -92,7 +92,7 @@ public:
|
||||
virtual const CBoundingBoxAligned GetWorldBoundsRec() { return GetWorldBounds(); } // default implementation
|
||||
|
||||
/**
|
||||
* Returns the world-space selection box of this model. Used primarily for hittesting against against a selection ray. The
|
||||
* Returns the world-space selection box of this model. Used primarily for hittesting against against a selection ray. The
|
||||
* returned selection box may be empty to indicate that it does not wish to participate in the selection process.
|
||||
*/
|
||||
virtual const CBoundingBoxOriented& GetSelectionBox();
|
||||
@ -105,7 +105,7 @@ public:
|
||||
m_SelectionBoxValid = false;
|
||||
}
|
||||
|
||||
/// Sets a custom selection shape as described by a @p descriptor. Argument may be NULL
|
||||
/// Sets a custom selection shape as described by a @p descriptor. Argument may be NULL
|
||||
/// if you wish to keep the default behaviour of using the recursively-calculated bounding boxes.
|
||||
void SetCustomSelectionShape(CustomSelectionShape* descriptor)
|
||||
{
|
||||
@ -121,7 +121,7 @@ public:
|
||||
* May return an empty bound to indicate that this model and its children should not be selectable themselves, or should
|
||||
* not be included in its parent model's selection box. This method is used for constructing the default selection boxes,
|
||||
* as opposed to any boxes of custom shape specified by @ref m_CustomSelectionShape.
|
||||
*
|
||||
*
|
||||
* If you wish your model type to be included in selection boxes, override this method and have it return the object-space
|
||||
* bounds of itself, augmented recursively (via this method) with the object-space selection bounds of its children.
|
||||
*/
|
||||
@ -180,8 +180,8 @@ protected:
|
||||
/// Is the current selection box valid?
|
||||
bool m_SelectionBoxValid;
|
||||
|
||||
/// Pointer to a descriptor for a custom-defined selection box shape. If no custom selection box is required, this is NULL
|
||||
/// and the standard recursive-bounding-box-based selection box is used. Otherwise, a custom selection box described by this
|
||||
/// Pointer to a descriptor for a custom-defined selection box shape. If no custom selection box is required, this is NULL
|
||||
/// and the standard recursive-bounding-box-based selection box is used. Otherwise, a custom selection box described by this
|
||||
/// field will be used.
|
||||
/// @see SetCustomSelectionShape
|
||||
CustomSelectionShape* m_CustomSelectionShape;
|
||||
|
@ -36,13 +36,13 @@ class CBoneState;
|
||||
/**
|
||||
* Describes the position of a prop point within its parent model. A prop point is the location within a parent model
|
||||
* where the prop's origin will be attached.
|
||||
*
|
||||
*
|
||||
* A prop point is specified by its transformation matrix (or separately by its position and rotation), which
|
||||
* can be relative to either the parent model's origin, or one of the parent's bones. If the parent model is boned,
|
||||
* then the @ref m_BoneIndex field may specify a bone to which the transformation matrix is relative (see
|
||||
* @ref CModel::m_BoneMatrices). Otherwise, the transformation matrix is assumed to be relative to the parent model's
|
||||
* can be relative to either the parent model's origin, or one of the parent's bones. If the parent model is boned,
|
||||
* then the @ref m_BoneIndex field may specify a bone to which the transformation matrix is relative (see
|
||||
* @ref CModel::m_BoneMatrices). Otherwise, the transformation matrix is assumed to be relative to the parent model's
|
||||
* origin.
|
||||
*
|
||||
*
|
||||
* @see CModel::m_BoneMatrices
|
||||
*/
|
||||
struct SPropPoint
|
||||
@ -51,7 +51,7 @@ struct SPropPoint
|
||||
CStr m_Name;
|
||||
|
||||
/**
|
||||
* Position of the point within the parent model, relative to either the parent model's origin or one of the parent
|
||||
* Position of the point within the parent model, relative to either the parent model's origin or one of the parent
|
||||
* model's bones if applicable. Also specified as part of @ref m_Transform.
|
||||
* @see m_Transform
|
||||
*/
|
||||
@ -80,8 +80,8 @@ struct SPropPoint
|
||||
};
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// SVertexBlend: structure containing the necessary data for blending vertices
|
||||
// with multiple bones
|
||||
// SVertexBlend: structure containing the necessary data for blending vertices
|
||||
// with multiple bones
|
||||
struct SVertexBlend
|
||||
{
|
||||
enum { SIZE = 4 };
|
||||
@ -131,7 +131,7 @@ public:
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////
|
||||
// CModelDef: a raw 3D model; describes the vertices, faces, skinning and skeletal
|
||||
// CModelDef: a raw 3D model; describes the vertices, faces, skinning and skeletal
|
||||
// information of a model
|
||||
class CModelDef
|
||||
{
|
||||
@ -160,12 +160,12 @@ public:
|
||||
* @throw PSERROR_File if it can't load the model
|
||||
*/
|
||||
static CModelDef* Load(const VfsPath& filename, const VfsPath& name);
|
||||
|
||||
|
||||
public:
|
||||
// accessor: get vertex data
|
||||
size_t GetNumVertices() const { return m_NumVertices; }
|
||||
SModelVertex* GetVertices() const { return m_pVertices; }
|
||||
|
||||
|
||||
// accessor: get number of UV sets
|
||||
size_t GetNumUVsPerVertex() const { return m_NumUVsPerVertex; }
|
||||
|
||||
@ -249,7 +249,7 @@ public:
|
||||
* object.
|
||||
*/
|
||||
void SetRenderData(const void* key, CModelDefRPrivate* data);
|
||||
|
||||
|
||||
// accessor: render data
|
||||
CModelDefRPrivate* GetRenderData(const void* key) const;
|
||||
|
||||
@ -285,4 +285,4 @@ private:
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
@ -70,7 +70,7 @@ public:
|
||||
float m_maxHeight;
|
||||
bool m_selectable;
|
||||
};
|
||||
|
||||
|
||||
struct Samp
|
||||
{
|
||||
// identifier name of sampler in GLSL shaders
|
||||
@ -128,11 +128,11 @@ public:
|
||||
|
||||
// Get a set of selection strings that are complete enough to specify an
|
||||
// exact variation of the actor, using the initial selections wherever possible
|
||||
// and choosing randomly where a choice is necessary.
|
||||
// and choosing randomly where a choice is necessary.
|
||||
std::set<CStr> CalculateRandomVariation(uint32_t seed, const std::set<CStr>& initialSelections);
|
||||
|
||||
// Given a prioritized vector of selection string sets that partially specify
|
||||
// a variation, calculates a remaining set of selection strings such that the resulting
|
||||
// a variation, calculates a remaining set of selection strings such that the resulting
|
||||
// set merged with the initial selections fully specifies an exact variation of
|
||||
// the actor. The resulting selections are selected randomly, but only where a choice
|
||||
// is necessary (i.e. where there are multiple variants but the initial selections,
|
||||
|
@ -67,7 +67,7 @@ public:
|
||||
|
||||
CObjectEntry* FindObject(const CStrW& objname);
|
||||
void DeleteObject(CObjectEntry* entry);
|
||||
|
||||
|
||||
CObjectBase* FindObjectBase(const CStrW& objname);
|
||||
|
||||
CObjectEntry* FindObjectVariation(const CStrW& objname, const std::vector<std::set<CStr> >& selections);
|
||||
|
@ -52,7 +52,7 @@ struct SOverlayLine
|
||||
/**
|
||||
* Textured line overlay, with world-space coordinates, rendered in the world onto the terrain.
|
||||
* Designed for relatively static textured lines, i.e. territory borders, originally.
|
||||
*
|
||||
*
|
||||
* Once submitted for rendering, instances must not be copied afterwards. The reason is that they
|
||||
* are assigned rendering data that is unique to the submitted instance, and non-transferable to
|
||||
* any copies that would otherwise be made. Amongst others, this restraint includes that they must
|
||||
@ -104,11 +104,11 @@ struct SOverlayTexturedLine
|
||||
const CSimContext* m_SimContext;
|
||||
|
||||
/**
|
||||
* Cached renderer data, because expensive to compute. Allocated by the renderer when necessary
|
||||
* Cached renderer data, because expensive to compute. Allocated by the renderer when necessary
|
||||
* for rendering purposes.
|
||||
*
|
||||
* Note: the rendering data may be shared between copies of this object to prevent having to
|
||||
* recompute it, while at the same time maintaining copyability of this object (see also docs on
|
||||
*
|
||||
* Note: the rendering data may be shared between copies of this object to prevent having to
|
||||
* recompute it, while at the same time maintaining copyability of this object (see also docs on
|
||||
* CTexturedLineRData).
|
||||
*/
|
||||
shared_ptr<CTexturedLineRData> m_RenderData;
|
||||
|
@ -89,7 +89,7 @@ public:
|
||||
{
|
||||
m_Rot = rot;
|
||||
}
|
||||
|
||||
|
||||
CQuaternion GetRotation() const
|
||||
{
|
||||
return m_Rot;
|
||||
|
@ -98,7 +98,7 @@ private:
|
||||
GLenum m_BlendFuncDst;
|
||||
bool m_StartFull;
|
||||
bool m_UseRelativeVelocity;
|
||||
|
||||
|
||||
float m_MaxLifetime;
|
||||
size_t m_MaxParticles;
|
||||
CBoundingBoxAligned m_MaxBounds;
|
||||
|
@ -91,11 +91,11 @@ public:
|
||||
}
|
||||
|
||||
/**
|
||||
* (Re)calculates and stores any bounds or bound-dependent data for this object. At this abstraction level, this is only the world-space
|
||||
* bounds stored in @ref m_WorldBounds; subclasses may use this method to (re)compute additional bounds if necessary, or any data that
|
||||
* depends on the bounds. Whenever bound-dependent data is requested through a public interface, @ref RecalculateBoundsIfNecessary should
|
||||
* (Re)calculates and stores any bounds or bound-dependent data for this object. At this abstraction level, this is only the world-space
|
||||
* bounds stored in @ref m_WorldBounds; subclasses may use this method to (re)compute additional bounds if necessary, or any data that
|
||||
* depends on the bounds. Whenever bound-dependent data is requested through a public interface, @ref RecalculateBoundsIfNecessary should
|
||||
* be called first to ensure bound correctness, which will in turn call this method if it turns out that they're outdated.
|
||||
*
|
||||
*
|
||||
* @see m_BoundsValid
|
||||
* @see RecalculateBoundsIfNecessary
|
||||
*/
|
||||
@ -147,12 +147,12 @@ protected:
|
||||
CRenderData* m_RenderData;
|
||||
|
||||
/**
|
||||
* Remembers whether any bounds need to be recalculated. Subclasses that add any data that depends on the bounds should
|
||||
* Remembers whether any bounds need to be recalculated. Subclasses that add any data that depends on the bounds should
|
||||
* take care to consider the validity of the bounds and recalculate their data when necessary -- overriding @ref CalcBounds
|
||||
* to do so would be a good idea, since it's already set up to be called by @ref RecalculateBoundsIfNecessary whenever the
|
||||
* bounds are marked as invalid. The latter should then be called before returning any bounds or bounds-derived data through
|
||||
* a public interface (see the implementation of @ref GetWorldBounds for an example).
|
||||
*
|
||||
*
|
||||
* @see CalcBounds
|
||||
* @see InvalidateBounds
|
||||
* @see RecalculateBoundsIfNecessary
|
||||
|
@ -29,7 +29,7 @@ class CVector4D;
|
||||
/**
|
||||
* Represents a mapping of name strings to value, for use with
|
||||
* CShaderDefines (values are strings) and CShaderUniforms (values are vec4s).
|
||||
*
|
||||
*
|
||||
* Stored as interned vectors of name-value pairs, to support high performance
|
||||
* comparison operators.
|
||||
*
|
||||
@ -96,12 +96,12 @@ public:
|
||||
{
|
||||
// Name/value pair
|
||||
typedef std::pair<CStrIntern, value_t> Item;
|
||||
|
||||
|
||||
// Sorted by name; no duplicated names
|
||||
std::vector<Item> items;
|
||||
|
||||
|
||||
size_t hash;
|
||||
|
||||
|
||||
void RecalcHash();
|
||||
};
|
||||
|
||||
@ -181,14 +181,14 @@ enum RENDER_QUERIES
|
||||
|
||||
/**
|
||||
* Uniform values that need to be evaluated in the renderer.
|
||||
*
|
||||
*
|
||||
* Not thread-safe - must only be used from the main thread.
|
||||
*/
|
||||
class CShaderRenderQueries
|
||||
{
|
||||
public:
|
||||
typedef std::pair<int, CStrIntern> RenderQuery;
|
||||
|
||||
|
||||
void Add(const char* name);
|
||||
size_t GetSize() const { return m_Items.size(); }
|
||||
RenderQuery GetItem(size_t i) const { return m_Items[i]; }
|
||||
@ -212,11 +212,11 @@ public:
|
||||
int m_CondType;
|
||||
std::vector<float> m_CondArgs;
|
||||
};
|
||||
|
||||
|
||||
void Add(const char* defname, const char* defvalue, int type, std::vector<float> &args);
|
||||
size_t GetSize() const { return m_Defines.size(); }
|
||||
const CondDefine& GetItem(size_t i) const { return m_Defines[i]; }
|
||||
|
||||
|
||||
private:
|
||||
std::vector<CondDefine> m_Defines;
|
||||
};
|
||||
|
@ -35,7 +35,7 @@
|
||||
|
||||
/**
|
||||
* Shader manager: loads and caches shader programs.
|
||||
*
|
||||
*
|
||||
* For a high-level overview of shaders and materials, see
|
||||
* http://trac.wildfiregames.com/wiki/MaterialSystem
|
||||
*/
|
||||
|
@ -58,7 +58,7 @@ enum
|
||||
* the shader .xml file. Alternatively (and more efficiently, if used very frequently),
|
||||
* call GetTextureBinding/GetUniformBinding and pass its return value as the ID.
|
||||
* Setting uniforms that the shader .xml doesn't support is harmless.
|
||||
*
|
||||
*
|
||||
* For a high-level overview of shaders and materials, see
|
||||
* http://trac.wildfiregames.com/wiki/MaterialSystem
|
||||
*/
|
||||
@ -71,7 +71,7 @@ public:
|
||||
typedef CStrIntern texture_id_t;
|
||||
typedef CStrIntern uniform_id_t;
|
||||
typedef std::pair<int, GLenum> frag_index_pair_t;
|
||||
|
||||
|
||||
/**
|
||||
* Construct based on ARB vertex/fragment program files.
|
||||
*/
|
||||
@ -92,7 +92,7 @@ public:
|
||||
* Construct an instance of a pre-defined fixed-function pipeline setup.
|
||||
*/
|
||||
static CShaderProgram* ConstructFFP(const std::string& id, const CShaderDefines& defines);
|
||||
|
||||
|
||||
/**
|
||||
* Represents a uniform attribute or texture binding.
|
||||
* For uniforms:
|
||||
|
@ -28,7 +28,7 @@
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////
|
||||
// CBoneState: structure describing state of a bone at some point
|
||||
class CBoneState
|
||||
class CBoneState
|
||||
{
|
||||
public:
|
||||
// translation of bone relative to root
|
||||
@ -39,7 +39,7 @@ public:
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////
|
||||
// CSkeletonAnimDef: raw description - eg bonestates - of an animation that plays upon
|
||||
// CSkeletonAnimDef: raw description - eg bonestates - of an animation that plays upon
|
||||
// a skeleton
|
||||
class CSkeletonAnimDef
|
||||
{
|
||||
@ -64,7 +64,7 @@ public:
|
||||
|
||||
// accessors: get a key for given bone at given time
|
||||
Key& GetKey(size_t frame, size_t bone) { return m_Keys[frame*m_NumKeys+bone]; }
|
||||
const Key& GetKey(size_t frame, size_t bone) const { return m_Keys[frame*m_NumKeys+bone]; }
|
||||
const Key& GetKey(size_t frame, size_t bone) const { return m_Keys[frame*m_NumKeys+bone]; }
|
||||
|
||||
// get duration of this anim, in ms
|
||||
float GetDuration() const { return m_NumFrames*m_FrameTime; }
|
||||
|
@ -32,7 +32,7 @@ class CSkeletonAnimDef;
|
||||
class CStr8;
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// CSkeletonAnimManager : owner class of all skeleton anims - manages creation,
|
||||
// CSkeletonAnimManager : owner class of all skeleton anims - manages creation,
|
||||
// loading and destruction of animation data
|
||||
class CSkeletonAnimManager
|
||||
{
|
||||
@ -41,7 +41,7 @@ public:
|
||||
// constructor, destructor
|
||||
CSkeletonAnimManager(CColladaManager& colladaManager);
|
||||
~CSkeletonAnimManager();
|
||||
|
||||
|
||||
// return a given animation by filename; return null if filename doesn't
|
||||
// refer to valid animation file
|
||||
CSkeletonAnimDef* GetAnimation(const VfsPath& pathname);
|
||||
|
@ -108,7 +108,7 @@ public:
|
||||
|
||||
// get patch at given coordinates, expressed in patch-space; return 0 if
|
||||
// coordinates represent patch off the edge of the map
|
||||
CPatch* GetPatch(ssize_t i, ssize_t j) const;
|
||||
CPatch* GetPatch(ssize_t i, ssize_t j) const;
|
||||
// get tile at given coordinates, expressed in tile-space; return 0 if
|
||||
// coordinates represent tile off the edge of the map
|
||||
CMiniPatch* GetTile(ssize_t i, ssize_t j) const;
|
||||
|
@ -73,7 +73,7 @@ public:
|
||||
// failure
|
||||
// The parent pointer may be NULL, for the "root" terrainproperties object.
|
||||
static CTerrainPropertiesPtr FromXML(const CTerrainPropertiesPtr& parent, const VfsPath& pathname);
|
||||
|
||||
|
||||
void LoadXml(XMBElement node, CXeromyces *pFile, const VfsPath& pathname);
|
||||
|
||||
// Save the object to an XML file. Implement when needed! ;-)
|
||||
|
@ -43,26 +43,26 @@ public:
|
||||
private:
|
||||
// Tag = file name stripped of path and extension (grass_dark_1)
|
||||
CStr m_Tag;
|
||||
|
||||
|
||||
// The property sheet used by this texture
|
||||
CTerrainPropertiesPtr m_pProperties;
|
||||
|
||||
|
||||
CMaterial m_Material;
|
||||
|
||||
CMatrix3D m_TextureMatrix;
|
||||
|
||||
|
||||
// BGRA color of topmost mipmap level, for coloring minimap, or a color
|
||||
// specified by the terrain properties
|
||||
u32 m_BaseColor;
|
||||
// ..Valid is true if the base color has been cached
|
||||
bool m_BaseColorValid;
|
||||
|
||||
|
||||
// All terrain type groups we're a member of
|
||||
GroupVector m_Groups;
|
||||
|
||||
// calculate the root color of the texture, used for coloring minimap
|
||||
void BuildBaseColor();
|
||||
|
||||
|
||||
void LoadAlphaMaps(VfsPath &amtype);
|
||||
|
||||
public:
|
||||
@ -73,15 +73,15 @@ public:
|
||||
|
||||
CStr GetTag() const
|
||||
{ return m_Tag; }
|
||||
|
||||
|
||||
const CTerrainProperties& GetProperties() const
|
||||
{ return *m_pProperties; }
|
||||
|
||||
|
||||
// Get texture handle, load texture if not loaded.
|
||||
const CTexturePtr& GetTexture() {
|
||||
return m_Material.GetDiffuseTexture();
|
||||
}
|
||||
|
||||
|
||||
const CMaterial& GetMaterial() {
|
||||
return m_Material;
|
||||
}
|
||||
@ -95,9 +95,9 @@ public:
|
||||
if (!m_BaseColorValid) BuildBaseColor();
|
||||
return m_BaseColor;
|
||||
}
|
||||
|
||||
|
||||
//TerrainAlpha *m_TerrainAlpha;
|
||||
CTerrainTextureManager::TerrainAlphaMap::iterator m_TerrainAlpha;
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
@ -55,7 +55,7 @@ public:
|
||||
m_Name(name),
|
||||
m_Index(index)
|
||||
{}
|
||||
|
||||
|
||||
// Add a texture entry to this terrain type
|
||||
void AddTerrain(CTerrainTextureEntry*);
|
||||
// Remove a texture entry
|
||||
@ -87,7 +87,7 @@ struct TerrainAlpha
|
||||
class CTerrainTextureManager : public Singleton<CTerrainTextureManager>
|
||||
{
|
||||
friend class CTerrainTextureEntry;
|
||||
|
||||
|
||||
public:
|
||||
typedef std::map<CStr, CTerrainGroup*> TerrainGroupMap;
|
||||
typedef std::map<VfsPath, TerrainAlpha> TerrainAlphaMap;
|
||||
@ -98,7 +98,7 @@ private:
|
||||
std::vector<CTerrainTextureEntry*> m_TextureEntries;
|
||||
|
||||
TerrainGroupMap m_TerrainGroups;
|
||||
|
||||
|
||||
TerrainAlphaMap m_TerrainAlphas;
|
||||
|
||||
size_t m_LastGroupIndex;
|
||||
@ -113,16 +113,16 @@ public:
|
||||
int LoadTerrainTextures();
|
||||
|
||||
void UnloadTerrainTextures();
|
||||
|
||||
|
||||
CTerrainTextureEntry* FindTexture(const CStr& tag) const;
|
||||
|
||||
|
||||
// Create a texture object for a new terrain texture at path, using the
|
||||
// property sheet props.
|
||||
CTerrainTextureEntry* AddTexture(const CTerrainPropertiesPtr& props, const VfsPath& path);
|
||||
|
||||
|
||||
// Remove the texture from all our maps and lists and delete it afterwards.
|
||||
void DeleteTexture(CTerrainTextureEntry* entry);
|
||||
|
||||
|
||||
// Find or create a new texture group. All terrain groups are owned by the
|
||||
// texturemanager (TerrainTypeManager)
|
||||
CTerrainGroup* FindGroup(const CStr& name);
|
||||
|
@ -28,7 +28,7 @@
|
||||
* Describes an outline of a territory, where the latter are understood to mean the largest sets of mutually connected tiles
|
||||
* ('connected' as in the mathematical sense from graph theory) that are either all reachable or all unreachable from a root
|
||||
* influence entity.
|
||||
*
|
||||
*
|
||||
* Note that the latter property is also called the 'connected' flag in the territory manager terminology, because for tiles
|
||||
* to be reachable from a root influence entity they must in fact be mathematically connected. Hence, you should not confuse
|
||||
* the 'connected' flag with the pure mathematical concept of connectedness, because in the former it is implicitly
|
||||
|
@ -36,7 +36,7 @@ public:
|
||||
void ResetTransform();
|
||||
|
||||
CMatrix3D GetTransform();
|
||||
|
||||
|
||||
void SetTransform(const CMatrix3D& transform);
|
||||
|
||||
void Translate(float x, float y, float z);
|
||||
@ -53,12 +53,12 @@ public:
|
||||
* Set the color for subsequent print calls.
|
||||
*/
|
||||
void Color(const CColor& color);
|
||||
|
||||
|
||||
/**
|
||||
* Set the color for subsequent print calls.
|
||||
*/
|
||||
void Color(float r, float g, float b, float a = 1.0);
|
||||
|
||||
|
||||
/**
|
||||
* Set the font for subsequent print calls.
|
||||
*/
|
||||
|
@ -76,7 +76,7 @@ public:
|
||||
void SetID(entity_id_t id);
|
||||
|
||||
const std::set<CStr>& GetActorSelections() const { return m_ActorSelections; }
|
||||
|
||||
|
||||
void SetActorSelections(const std::set<CStr>& selections);
|
||||
|
||||
private:
|
||||
|
@ -54,7 +54,7 @@ public:
|
||||
|
||||
// return the units
|
||||
const std::vector<CUnit*>& GetUnits() const { return m_Units; }
|
||||
|
||||
|
||||
void SetObjectManager(CObjectManager& objectManager) { m_ObjectManager = &objectManager; }
|
||||
|
||||
private:
|
||||
|
@ -29,7 +29,7 @@
|
||||
namespace JSI_GameView
|
||||
{
|
||||
void RegisterScriptFunctions(ScriptInterface& ScriptInterface);
|
||||
|
||||
|
||||
DECLARE_BOOLEAN_SCRIPT_SETTING(Culling);
|
||||
DECLARE_BOOLEAN_SCRIPT_SETTING(LockCullCamera);
|
||||
DECLARE_BOOLEAN_SCRIPT_SETTING(ConstrainCamera);
|
||||
|
@ -42,7 +42,7 @@ private:
|
||||
SColor4ub colorStruct = ConvertRGBColorTo4ub(RGBColor(r,g,b));
|
||||
u32 actual;
|
||||
memcpy(&actual, &colorStruct, sizeof(u32));
|
||||
expected |= 0xff000000; // ConvertRGBColorTo4ub sets alpha to opaque
|
||||
expected |= 0xff000000; // ConvertRGBColorTo4ub sets alpha to opaque
|
||||
TS_ASSERT_EQUALS(expected, actual);
|
||||
}
|
||||
};
|
||||
|
@ -43,7 +43,7 @@ const OsPath testSkeletonDefs(L"art/skeletons/skeletons.xml");
|
||||
|
||||
extern PIVFS g_VFS;
|
||||
|
||||
class TestMeshManager : public CxxTest::TestSuite
|
||||
class TestMeshManager : public CxxTest::TestSuite
|
||||
{
|
||||
void initVfs()
|
||||
{
|
||||
|
@ -43,7 +43,7 @@ public:
|
||||
TS_ASSERT(defines1 < defines2 || defines2 < defines1);
|
||||
|
||||
defines2.Add(CStrIntern("FOO"), CStrIntern("2"));
|
||||
|
||||
|
||||
TS_ASSERT_EQUALS(defines1.GetInt("FOO"), 1);
|
||||
TS_ASSERT_EQUALS(defines2.GetInt("FOO"), 2);
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
#include "gui/GUIutil.h"
|
||||
#include "ps/CLogger.h"
|
||||
|
||||
class TestGuiParseString : public CxxTest::TestSuite
|
||||
class TestGuiParseString : public CxxTest::TestSuite
|
||||
{
|
||||
public:
|
||||
void test_clientarea()
|
||||
|
@ -231,11 +231,11 @@ public:
|
||||
* translations for @p locale.
|
||||
*/
|
||||
std::vector<std::wstring> GetDictionariesForLocale(const std::string& locale) const;
|
||||
|
||||
|
||||
std::wstring GetFallbackToAvailableDictLocale(const Locale& locale) const;
|
||||
|
||||
|
||||
std::wstring GetFallbackToAvailableDictLocale(const std::string& locale) const;
|
||||
|
||||
|
||||
/**
|
||||
* Returns the code of the recommended locale for the current user that the
|
||||
* game supports.
|
||||
|
@ -357,7 +357,7 @@ namespace JSI_L10n
|
||||
*/
|
||||
std::string GetLocaleScript(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), const std::string& locale);
|
||||
|
||||
|
||||
|
||||
std::wstring GetFallbackToAvailableDictLocale(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), const std::string& locale);
|
||||
|
||||
/**
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
@ -128,7 +128,7 @@ public:
|
||||
: allocator(rhs.allocator)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
// (required by VC2010 std::vector)
|
||||
bool operator==(const ProxyAllocator& rhs) const
|
||||
{
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
@ -31,7 +31,7 @@
|
||||
#include "lib/allocators/allocator_policies.h"
|
||||
|
||||
namespace Allocators {
|
||||
|
||||
|
||||
/**
|
||||
* allocator design parameters:
|
||||
* - O(1) allocation and deallocation;
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
@ -25,7 +25,7 @@
|
||||
#include "lib/allocators/dynarray.h"
|
||||
#include "lib/byte_order.h"
|
||||
|
||||
class TestAllocators : public CxxTest::TestSuite
|
||||
class TestAllocators : public CxxTest::TestSuite
|
||||
{
|
||||
public:
|
||||
void test_da()
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
@ -27,7 +27,7 @@
|
||||
|
||||
void* const null = 0;
|
||||
|
||||
class TestHeaderless: public CxxTest::TestSuite
|
||||
class TestHeaderless: public CxxTest::TestSuite
|
||||
{
|
||||
public:
|
||||
void test_Basic()
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
@ -33,7 +33,7 @@
|
||||
#if ICC_VERSION
|
||||
# pragma warning(push)
|
||||
# pragma warning(disable:82) // storage class is not first
|
||||
# pragma warning(disable:193) // zero used for undefined preprocessing identifier
|
||||
# pragma warning(disable:193) // zero used for undefined preprocessing identifier
|
||||
# pragma warning(disable:304) // access control not specified
|
||||
# pragma warning(disable:367) // duplicate friend declaration
|
||||
# pragma warning(disable:444) // destructor for base class is not virtual
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
@ -25,7 +25,7 @@
|
||||
#include "lib/self_test.h"
|
||||
#include "lib/res/file/archive/codec_zlib.h"
|
||||
|
||||
class TestCodecZLib : public CxxTest::TestSuite
|
||||
class TestCodecZLib : public CxxTest::TestSuite
|
||||
{
|
||||
public:
|
||||
void test_compress_decompress_compare()
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
@ -25,7 +25,7 @@
|
||||
#include "lib/self_test.h"
|
||||
#include "lib/res/file/archive/compression.h"
|
||||
|
||||
class TestCompression : public CxxTest::TestSuite
|
||||
class TestCompression : public CxxTest::TestSuite
|
||||
{
|
||||
public:
|
||||
void test_compress_decompress_compare()
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
#include "lib/res/file/archive/fat_time.h"
|
||||
|
||||
class TestFatTime: public CxxTest::TestSuite
|
||||
class TestFatTime: public CxxTest::TestSuite
|
||||
{
|
||||
public:
|
||||
void test_fat_timedate_conversion()
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
#include "lib/res/file/archive/zip.h"
|
||||
|
||||
class TestZip : public CxxTest::TestSuite
|
||||
class TestZip : public CxxTest::TestSuite
|
||||
{
|
||||
public:
|
||||
};
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
@ -7,10 +7,10 @@
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user