Switch to intXX_t

src/Camera.h

@@ -47,10 +47,10 @@ public:
 	//! Sets the camera's position
 	void SetPosition(const Vec3& position);
 
-	//! Returns the camera's lookat-point
+	//! Returns the camera's lookat-point32_t
 	const Vec3& GetLookAt() const;
 
-	//! Sets the camera's lookat-point
+	//! Sets the camera's lookat-point32_t
 	void SetLookAt(const Vec3& lookat);
 
 	//! Returns the camera's up vector

src/Device.cpp

@@ -189,7 +189,7 @@ bool Device::ParseCommandLine(int argc, char** argv)
 		os::printf("Usage: %s [options]\n", argv[0]);
 		os::printf("Options:\n\n");
 		os::printf("All of the following options take precedence over\nenvironment variables and configuration files.\n\n");
-		// Print options
+		// Print32_t options
 		os::printf("  -help\t\t\t\t\tShow this help\n");
 		os::printf("  -root-path <path>\t\t\tUse <path> as the filesystem root path\n");
 		os::printf("  -user-path <path>\t\t\tUse <path> as the filesystem user path\n");
@@ -200,7 +200,7 @@ bool Device::ParseCommandLine(int argc, char** argv)
 	}
 
 	// Parse command line arguments
-	int i = 1;
+	int32_t i = 1;
 	while (i < argc)
 	{
 		if (Str::StrCmp(argv[i], "-root-path") == 0)

src/Device.h

@@ -62,12 +62,12 @@ private:
 
 	bool					ParseCommandLine(int argc, char** argv);
 
-	static const uint16_t		CROWN_MAJOR;
-	static const uint16_t		CROWN_MINOR;
-	static const uint16_t		CROWN_MICRO;
+	static const uint16_t	CROWN_MAJOR;
+	static const uint16_t	CROWN_MINOR;
+	static const uint16_t	CROWN_MICRO;
 
-	int						mPreferredWindowWidth;
-	int						mPreferredWindowHeight;
+	int32_t					mPreferredWindowWidth;
+	int32_t					mPreferredWindowHeight;
 	bool					mPreferredWindowFullscreen;
 	Str						mPreferredRootPath;
 	Str						mPreferredUserPath;

src/EventBuffer.cpp

@@ -46,7 +46,7 @@ void EventBuffer::PushEvent(uint32_t eventType, void* eventData, size_t eventSiz
 		Flush();
 	}
 
-	char* q = mBuffer + mBufferCount;
+	uint8_t* q = mBuffer + mBufferCount;
 
 	*(uint32_t*) q = eventType;
 	*(size_t*) (q + sizeof(eventType)) = eventSize;
@@ -55,14 +55,14 @@ void EventBuffer::PushEvent(uint32_t eventType, void* eventData, size_t eventSiz
 	mBufferCount += sizeof(eventType) + sizeof(eventSize) + eventSize;
 }
 
-void EventBuffer::PushEventBuffer(char* eventBuffer, size_t bufferSize)
+void EventBuffer::PushEventBuffer(uint8_t* eventBuffer, size_t bufferSize)
 {
 	if (mBufferCount + bufferSize > MAX_EVENT_QUEUE_SIZE)
 	{
 		Flush();
 	}
 
-	char* q = mBuffer + mBufferCount;
+	uint8_t* q = mBuffer + mBufferCount;
 	memcpy(q, eventBuffer, bufferSize);
 
 	mBufferCount += bufferSize;
@@ -74,7 +74,7 @@ void* EventBuffer::NextEvent(uint32_t& eventType, size_t& size)
 
 	if (read < mBufferCount)
 	{
-		char* q = mBuffer + read;
+		uint8_t* q = mBuffer + read;
 
 		eventType = *(uint32_t*)q;
 		size = *(size_t*)(q + sizeof(uint32_t));
@@ -104,7 +104,7 @@ size_t EventBuffer::GetSize() const
 	return mBufferCount;
 }
 
-char* EventBuffer::GetBuffer()
+uint8_t* EventBuffer::GetBuffer()
 {
 	return mBuffer;
 }

src/EventBuffer.h

@@ -46,7 +46,7 @@ public:
 				~EventBuffer();
 
 	void		PushEvent(uint32_t eventType, void* eventData, size_t eventSize);
-	void		PushEventBuffer(char* eventBuffer, size_t bufferSize);
+	void		PushEventBuffer(uint8_t* eventBuffer, size_t bufferSize);
 
 	void*		NextEvent(uint32_t& eventType, size_t& size);
 
@@ -54,12 +54,12 @@ public:
 	void		Flush();
 
 	size_t		GetSize() const;
-	char*		GetBuffer();
+	uint8_t*		GetBuffer();
 
 public:
 
 	size_t		mBufferCount;					// Number of bytes in the buffer
-	char		mBuffer[MAX_EVENT_QUEUE_SIZE];
+	uint8_t		mBuffer[MAX_EVENT_QUEUE_SIZE];
 };
 
 } // namespace crown

src/Filesystem.cpp

@@ -287,7 +287,7 @@ void Filesystem::Close(Stream* stream)
 }
 
 //-----------------------------------------------------------------------------
-void Filesystem::PrintReport()
+void Filesystem::Print32_tReport()
 {
 	Log::I("--- Filesystem report ---");
 	Log::I("Path separator\t: '/'");
@@ -566,7 +566,7 @@ const char* Filesystem::GetExtension(const char* relativePath)
 
 	static char extension[32];
 
-	int i = Str::FindLast(relativePath, '.');
+	int32_t i = Str::FindLast(relativePath, '.');
 
 	if (i == -1)
 	{

src/Filesystem.h

@@ -50,7 +50,7 @@ struct FilesystemEntry
 	{
 	}
 
-	void PrintReport()
+	void Print32_tReport()
 	{
 		Log::I("OSPath\t\t: %s", osPath.c_str());
 		Log::I("RelPath\t\t: %s", relativePath.c_str());
@@ -73,7 +73,7 @@ class Stream;
 	Accessing files:
 	Every file and every directory is accessed through the filesystem.
 	Not a single C/C++ std file io call should be used in any other part
-	of the engine in order to maintain platform independence.
+	of the engine in order to maint32_tain platform independence.
 
 	Pathnames:
 	Only unix-like pathnames (i.e. case sensitive and using '/' as separator)
@@ -135,7 +135,7 @@ public:
 
 	void				Close(Stream* stream);
 
-	void				PrintReport();
+	void				Print32_tReport();
 
 	static bool			IsValidSegment(const char* segment);
 	static bool			IsValidPath(const char* path);

src/Font.cpp

@@ -65,7 +65,7 @@ void Font::LoadFromFile(const Str& filename)
 
 		while (textReader.ReadString(buf, 1024) != NULL)
 		{
-			int ch;
+			int32_t ch;
 			float a, b, c, d, e, f, g, h;
 
 			sscanf(buf, "%d %f %f %f %f %f %f %f %f\n", &ch, &a, &b, &c, &d, &e, &f, &g, &h);

src/Font.h

@@ -56,12 +56,12 @@ public:
 
 	void					LoadFromFile(const Str& filename);
 
-	Glyph&					GetGlyph(uint32_t code);	//! Returns the glyph for the desired point code
+	Glyph&					GetGlyph(uint32_t code);	//! Returns the glyph for the desired point32_t code
 	void					SetCodeGlyphMetrics(uint32_t code, float left, float right, float bottom, float top, float width, float height, float advance, float baseline);
 
-	inline uint32_t				_GetMaxTextHeight() { return mMaxTextHeight; }
-	inline uint32_t				_GetMaxCharacterHeight() { return mMaxCharacterHeight; }
-	inline uint32_t				_GetMaxCharacterWidth() { return mMaxCharacterWidth; }
+	inline uint32_t			_GetMaxTextHeight() { return mMaxTextHeight; }
+	inline uint32_t			_GetMaxCharacterHeight() { return mMaxCharacterHeight; }
+	inline uint32_t			_GetMaxCharacterWidth() { return mMaxCharacterWidth; }
 
 	Texture*				GetTexture() { return mTexture; }
 
@@ -69,9 +69,9 @@ private:
 
 	CodeGlyphDict			mCodeGlyphDict;
 
-	uint32_t					mMaxTextHeight;
-	uint32_t					mMaxCharacterHeight;
-	uint32_t					mMaxCharacterWidth;
+	uint32_t				mMaxTextHeight;
+	uint32_t				mMaxCharacterHeight;
+	uint32_t				mMaxCharacterWidth;
 
 	Texture*				mTexture;
 };

src/FontManager.h

@@ -46,7 +46,7 @@ public:
 	 * If a resource with the same name already exists, the
 	 * already existent resource will be returned.
 	 * @param name The name of the resource
-	 * @return A pointer to the created resource
+	 * @return A point32_ter to the created resource
 	 */
 	Font* Create(const char* name, bool& created);
 
@@ -60,7 +60,7 @@ public:
 	 * @param filename The name of the file containing the resource
 	 * @param ttSize The size of characters in pixels
 	 * @param ttResolution The resolution of characters in DPI (Dots Per Inch)
-	 * @return A pointer to the loaded resource
+	 * @return A point32_ter to the loaded resource
 	 */
 	Font* Load(const char* name);
 

src/Glyph.h

@@ -50,7 +50,7 @@ public:
 	}
 
 	//! Constructor
-	Glyph(wchar_t code, float left, float right, float bottom, float top, float width, float height, float advance, float baseline) :
+	Glyph(uint32_t code, float left, float right, float bottom, float top, float width, float height, float advance, float baseline) :
 		mCodePoint(code),
 		mLeft(left),
 		mRight(right),
@@ -94,15 +94,15 @@ public:
 		mBaseline = baseline;
 	}
 
-	//! Returns the glyph's code point
-	wchar_t GetCodePoint() const
+	//! Returns the glyph's code point32_t
+	uint32_t GetCodePoint() const
 	{
 		return mCodePoint;
 	}
 
 private:
 
-	wchar_t mCodePoint;
+	uint32_t mCodePoint;
 	float mLeft;
 	float mRight;
 	float mBottom;

src/Image.cpp

@@ -81,7 +81,7 @@ void Image::DestroyImage()
 void Image::SetUniformColorImage(Color4 color)
 {
 	AssertRGB8();
-	int bpp = GetBytesPerPixel();
+	int32_t bpp = GetBytesPerPixel();
 
 	uint8_t red   = (uint8_t)(color.r * 255.0f);
 	uint8_t green = (uint8_t)(color.g * 255.0f);
@@ -89,10 +89,10 @@ void Image::SetUniformColorImage(Color4 color)
 
 	for(uint32_t i = 0; i < mHeight; i++)
 	{
-		int rowOffset = i * mWidth * bpp;
+		int32_t rowOffset = i * mWidth * bpp;
 		for(uint32_t j = 0; j < mWidth; j++)
 		{
-			int offset = rowOffset + bpp * j;
+			int32_t offset = rowOffset + bpp * j;
 			mBuffer[offset    ] = red;
 			mBuffer[offset + 1] = green;
 			mBuffer[offset + 2] = blue;
@@ -215,8 +215,8 @@ void Image::SetPixel(uint32_t x, uint32_t y, Color4 color)
 		throw ArgumentException("Coordinates outside the Image");
 	}*/
 
-	int bpp = 3;//GetBytesPerPixel();
-	int offset = (y * mWidth + x) * GetBytesPerPixel();
+	int32_t bpp = 3;//GetBytesPerPixel();
+	int32_t offset = (y * mWidth + x) * GetBytesPerPixel();
 	mBuffer[offset    ] = (uint8_t)(color.r * 255);
 	mBuffer[offset + 1] = (uint8_t)(color.g * 255);
 	mBuffer[offset + 2] = (uint8_t)(color.b * 255);

src/Image.h

@@ -68,10 +68,10 @@ public:
 	//! Returns the image's bytes per pixel
 	uint32_t GetBytesPerPixel() const;
 
-	//! Returns a pointer to the image data
+	//! Returns a point32_ter to the image data
 	uint8_t* GetBuffer();
 
-	//! Returns a const pointer to the image data
+	//! Returns a const point32_ter to the image data
 	const uint8_t* GetBuffer() const;
 
 	//! Apply a color-keying

src/Log.cpp

@@ -31,7 +31,7 @@ namespace crown
 {
 
 LogLevel Log::mThreshold = LL_DEBUG;
-int Log::mIndentCount = 0;
+int32_t Log::mIndentCount = 0;
 
 LogLevel Log::GetThreshold()
 {

src/Log.h

@@ -62,7 +62,7 @@ public:
 private:
 
 	static LogLevel		mThreshold;
-	static int			mIndentCount;
+	static int32_t			mIndentCount;
 };
 
 } // namespace crown

src/Material.cpp

@@ -116,12 +116,12 @@ void Material::SetEmission(const Color4& emission)
 	mEmission = emission;
 }
 
-int Material::GetShininess() const
+int32_t Material::GetShininess() const
 {
 	return mShininess;
 }
 
-void Material::SetShininess(int shininess)
+void Material::SetShininess(int32_t shininess)
 {
 	mShininess = shininess;
 }

src/Material.h

@@ -139,17 +139,17 @@ public:
 	//! Sets the specular reflectance
 	void SetSpecular(const Color4& specular);
 
-	//! Returns the emitted light intensity
+	//! Returns the emitted light int32_tensity
 	const Color4& GetEmission() const;
 
-	//! Sets the emitted light intensity
+	//! Sets the emitted light int32_tensity
 	void SetEmission(const Color4& emission);
 
 	//! Returns the shininess
-	int GetShininess() const;
+	int32_t GetShininess() const;
 
 	//! Sets the shininess
-	void SetShininess(int shininess);
+	void SetShininess(int32_t shininess);
 
 	//! Returns whether lighting is enabled
 	bool GetLighting() const;
@@ -199,10 +199,10 @@ public:
 	//! Sets whether blending is enabled
 	void SetBlending(bool blending);
 
-	//! Returns whether writing into the color buffer is enabled
+	//! Returns whether writing int32_to the color buffer is enabled
 	bool GetColorWrite() const;
 
-	//! Sets whether writing into the color buffer is enabled
+	//! Sets whether writing int32_to the color buffer is enabled
 	void SetColorWrite(bool write);
 
 	//! Returns whether fog is enabled
@@ -217,10 +217,10 @@ public:
 	//! Sets whether alpha test is enabled
 	void SetAlphaTest(bool test);
 
-	//! Returns whether point sprite is enabled
+	//! Returns whether point32_t sprite is enabled
 	bool GetPointSprite() const;
 
-	//! Sets whether point sprite is enabled
+	//! Sets whether point32_t sprite is enabled
 	void SetPointSprite(bool sprite);
 
 	//! Returns the shading type
@@ -289,22 +289,22 @@ public:
 	//! Sets the alpha reference
 	void SetAlphaRef(float ref);
 
-	//! Returns the points' size
+	//! Returns the point size
 	float GetPointSize() const;
 
-	//! Sets the points' size
+	//! Sets the point size
 	void SetPointSize(float size);
 
-	//! Returns the minimum points' size
+	//! Returns the minimum point size
 	float GetPointSizeMin() const;
 
-	//! Sets the minimum points' size
+	//! Sets the minimum point size
 	void SetPointSizeMin(float min);
 
-	//! Returns the maximum points' size
+	//! Returns the maximum point size
 	float GetPointSizeMax() const;
 
-	//! Sets the maximum points' size
+	//! Sets the maximum point' size
 	void SetPointSizeMax(float max);
 
 	//! Returns the blending equation
@@ -359,7 +359,7 @@ public:
 	Color4 mDiffuse;
 	Color4 mSpecular;
 	Color4 mEmission;
-	int mShininess;
+	int32_t mShininess;
 
 	bool mLighting				: 1; // Whether lighting is enabled
 	bool mTexturing				: 1; // Whether texturing is enabled
@@ -369,7 +369,7 @@ public:
 	bool mDepthWrite			: 1; // Whether depth write is enabled
 	bool mRescaleNormals		: 1; // Whether auto normal rescaling is enabled
 	bool mBlending				: 1; // Whether blending is enabled
-	bool mColorWrite			: 1; // Whether writing into the color buffer is enabled
+	bool mColorWrite			: 1; // Whether writing int32_to the color buffer is enabled
 	bool mFog					: 1; // Whether fog is enabled
 	bool mAlphaTest				: 1; // Whether alpha test is enabled
 	bool mPointSprite			: 1; // Whether point sprite is enabled

src/MaterialManager.h

@@ -41,11 +41,11 @@ public:
 	 * If a resource with the same name already exists, the
 	 * already existent resource will be returned. In order
 	 * to distinguish between a newly created resource or a
-	 * pointer to an existing one, you have to check
+	 * point32_ter to an existing one, you have to check
 	 * at the value returned by 'created'.
 	 * @param name The name of the resource
 	 * @param created Returns true if newly created, false otherwise
-	 * @return A pointer to the created resource
+	 * @return A point32_ter to the created resource
 	 */
 	Material* Create(const char* name, bool& created);
 
@@ -53,7 +53,7 @@ public:
 	 * Loads a material resource from file.
 	 * The name of the file determines the name of the resource and vice-versa.
 	 * @param name Tha name of the resource
-	 * @return A pointer to the loaded resource
+	 * @return A point32_ter to the loaded resource
 	 */
 	Material* Load(const char* name);
 

src/Mesh.cpp

@@ -45,7 +45,7 @@ Mesh::Mesh() :
 
 Mesh::~Mesh()
 {
-	for (int i = 0; i < mMeshChunkList.size(); i++)
+	for (int32_t i = 0; i < mMeshChunkList.size(); i++)
 	{
 		delete mMeshChunkList[i];
 	}

src/MeshChunk.cpp

@@ -41,12 +41,12 @@ MeshChunk::~MeshChunk()
 
 }
 
-int MeshChunk::GetVertexCount() const
+int32_t MeshChunk::GetVertexCount() const
 {
 	return mVertexList.size();
 }
 
-int MeshChunk::GetFaceCount() const
+int32_t MeshChunk::GetFaceCount() const
 {
 	return mFaceList.size();
 }
@@ -62,7 +62,7 @@ void MeshChunk::UpdateBoundingBox()
 
 	for (uint32_t i = 0; i < mVertexList.size(); i++)
 	{
-		mBoundingBox.add_point(mVertexList[i].position);
+		mBoundingBox.add_point32_t(mVertexList[i].position);
 	}
 }
 

src/MeshChunk.h

@@ -48,10 +48,10 @@ public:
 	~MeshChunk();
 
 	//! Returns the mesh's vertex count
-	int GetVertexCount() const;
+	int32_t GetVertexCount() const;
 
 	//! Returns the mesh's face count
-	int GetFaceCount() const;
+	int32_t GetFaceCount() const;
 
 	//! Returns the mesh's bounding box
 	const Box& GetBoundingBox() const;

src/MeshManager.h

@@ -46,7 +46,7 @@ public:
 	 * If a resource with the same name already exists, the
 	 * already existent resource will be returned.
 	 * @param name The name of the resource
-	 * @return A pointer to the created resource
+	 * @return A point32_ter to the created resource
 	 */
 	Mesh* Create(const char* name, bool& created);
 
@@ -54,7 +54,7 @@ public:
 	 * Loads a mesh resource from file.
 	 * The name of the file determines the name of the resource and vice-versa.
 	 * @param name Tha name of the resource
-	 * @return A pointer to the loaded resource
+	 * @return A point32_ter to the loaded resource
 	 */
 	Mesh* Load(const char* name);
 
@@ -62,7 +62,7 @@ public:
 	 * Loads a prefab cube mesh.
 	 * @param name The name of the mesh
 	 * @param size The size of the cube in units
-	 * @return A pointer to the loaded resource
+	 * @return A point32_ter to the loaded resource
 	 */
 	Mesh* LoadCube(const char* name, float size = 1.0f);
 
@@ -77,7 +77,7 @@ public:
 	 * @param name The name of the mesh
 	 * @param width The width of the plane in units
 	 * @param height The height of the plane in units
-	 * @return A pointer to the loaded resource
+	 * @return A point32_ter to the loaded resource
 	 */
 	Mesh* LoadPlane(const char* name, float width = 1.0f, float height = 1.0f);
 
@@ -90,7 +90,7 @@ public:
 	 * @param name The name of the mesh
 	 * @param size The size of the plane in units
 	 * @param tileSize The size of a tile in units
-	 * @return A pointer to the loaded resource
+	 * @return A point32_ter to the loaded resource
 	 */
 	Mesh* LoadGrid(const char* name, uint32_t size = 20, float tileSize = 1.0f);
 

src/Pixel.h

@@ -47,39 +47,39 @@ enum PixelFormat
 {
 	PF_L_8 = 0,				//!< Luminance only, 8-bit
 	PF_L_16 = 3,			//!< Luminance only, 16-bit
-	PF_L_32 = 14,			//!< Luminance only, 32-bit integer
-	PF_L_FLOAT_32 = 15,		//!< Luminance only, 32-bit flaoting point
+	PF_L_32 = 14,			//!< Luminance only, 32-bit int32_teger
+	PF_L_FLOAT_32 = 15,		//!< Luminance only, 32-bit flaoting point32_t
 
 	PF_LA_8 = 4,			//!< Luminance and alpha, 8-bit each
 	PF_LA_16 = 16,			//!< Luminance and alpha, 16-bit each
-	PF_LA_32 = 26,			//!< Luminance and alpha, 32-bit integer each
-	PF_LA_FLOAT_32 = 27,	//!< Luminance and alpha, 32-bit floating point each
+	PF_LA_32 = 26,			//!< Luminance and alpha, 32-bit int32_teger each
+	PF_LA_FLOAT_32 = 27,	//!< Luminance and alpha, 32-bit floating point32_t each
 
 	PF_AL_8 = 5,			//!< Luminance and alpha, 8-bit each
 	PF_AL_16 = 17,			//!< Luminance and alpha, 16-bit each
-	PF_AL_32 = 28,			//!< Luminance and alpha, 32-bit integer each
-	PF_AL_FLOAT_32 = 29,	//!< Luminance and alpha, 32-bit floating point each
+	PF_AL_32 = 28,			//!< Luminance and alpha, 32-bit int32_teger each
+	PF_AL_FLOAT_32 = 29,	//!< Luminance and alpha, 32-bit floating point32_t each
 
 	PF_RGB_8 = 12,			//!< RGB values, 8-bit each
 	PF_RGB_16 = 24,			//!< RGB values, 16-bit each
-	PF_RGB_32 = 32,			//!< RGB values, 32-bit integer each
-	PF_RGB_FLOAT_32 = 33,	//!< RGB values, 32-bit floating point each
+	PF_RGB_32 = 32,			//!< RGB values, 32-bit int32_teger each
+	PF_RGB_FLOAT_32 = 33,	//!< RGB values, 32-bit floating point32_t each
 
 	PF_RGB_3_3_2 = 1,		//!< Packed 8-bit RGB values
 	PF_RGB_5_6_5 = 6,		//!< Packed 16-bit RGB values
 
 	PF_BGR_8 = 13,			//!< BGR values, 8-bit each
 	PF_BGR_16 = 25,			//!< BGR values, 16-bit each
-	PF_BGR_32 = 34,			//!< BGR values, 32-bit integer each
-	PF_BGR_FLOAT_32 = 35,	//!< BGR values, 32-bit floating point each
+	PF_BGR_32 = 34,			//!< BGR values, 32-bit int32_teger each
+	PF_BGR_FLOAT_32 = 35,	//!< BGR values, 32-bit floating point32_t each
 
 	PF_BGR_2_3_3 = 2,		//!< Packed 8-bit BGR values
 	PF_BGR_5_6_5 = 7,		//!< Packed 16-bit BGR values
 
 	PF_RGBA_8 = 18,			//!< RGBA values, 8-bit each
 	PF_RGBA_16 = 30,		//!< RGBA values, 16-bit each
-	PF_RGBA_32 = 36,		//!< RGBA values, 32-bit integer each
-	PF_RGBA_FLOAT_32 = 37,	//!< RGBA values, 32-bit floating point each
+	PF_RGBA_32 = 36,		//!< RGBA values, 32-bit int32_teger each
+	PF_RGBA_FLOAT_32 = 37,	//!< RGBA values, 32-bit floating point32_t each
 
 	PF_RGBA_4_4_4_4 = 8,	//!< Packed 16-bit RGBA values
 	PF_RGBA_5_5_5_1 = 9,	//!< Packed 16-bit RGBA values
@@ -88,8 +88,8 @@ enum PixelFormat
 
 	PF_ABGR_8 = 21,			//!< ABGR values, 8-bit each
 	PF_ABGR_16 = 31,		//!< ABGR values, 16-bit each
-	PF_ABGR_32 = 38,		//!< ABGR values, 32-bit integer each
-	PF_ABGR_FLOAT_32 = 39,	//!< ABGR values, 32-bit floating point each
+	PF_ABGR_32 = 38,		//!< ABGR values, 32-bit int32_teger each
+	PF_ABGR_FLOAT_32 = 39,	//!< ABGR values, 32-bit floating point32_t each
 
 	PF_ABGR_4_4_4_4 = 10,	//!< Packed 16-bit ABGR values
 	PF_ABGR_1_5_5_5 = 11,	//!< Packed 16-bit ABGR values

src/Renderer.cpp

@@ -53,7 +53,7 @@ void Renderer::DestroyRenderer(Renderer* renderer)
 {
 	if (renderer == NULL)
 	{
-		throw NullPointerException("Renderer::DestroyRenderer: renderer == NULL");
+		throw NullPoint32_terException("Renderer::DestroyRenderer: renderer == NULL");
 	}
 
 	delete renderer;

src/Renderer.h

@@ -123,12 +123,12 @@ public:
 	@param specular
 		The specular reflectance
 	@param emission
-		The emitted light intensity
+		The emitted light int32_tensity
 	@param shininess
 		The specular exponent
 	*/
 	virtual void _SetMaterialParams(const Color4& ambient, const Color4& diffuse, const Color4& specular,
-					const Color4& emission, int shininess) = 0;
+					const Color4& emission, int32_t shininess) = 0;
 
 	/**
 		Sets whether lighting is enabled.
@@ -141,9 +141,9 @@ public:
 		Sets the global ambient light.
 	@note
 		The global ambient light defines the ambient
-		intensity for the entire scene.
+		int32_tensity for the entire scene.
 	@param color
-		The ambient intensity
+		The ambient int32_tensity
 	*/
 	virtual void _SetAmbientLight(const Color4& color) = 0;
 
@@ -169,7 +169,7 @@ public:
 		Sets the texture mode for the given texture unit.
 	@note
 		The texture mode specifies how the texture
-		values are interpreted when a fragment is
+		values are int32_terpreted when a fragment is
 		textured.
 	@param unit
 		The texture unit
@@ -290,7 +290,7 @@ public:
 	/**
 		Specifies fog parameters.
 	@note
-		This method specifies mode, intensity, start
+		This method specifies mode, int32_tensity, start
 		and end position and the color of fog.
 	*/ // TODO 
 	virtual void _SetFogParams(FogMode mode, float density, float start, float end, const Color4& color) = 0;
@@ -305,11 +305,11 @@ public:
 
 	virtual void _SetFrontFace(FrontFace face) = 0;
 
-	virtual void _SetViewportParams(int x, int y, int width, int height) = 0;
+	virtual void _SetViewportParams(int32_t x, int32_t y, int32_t width, int32_t height) = 0;
 
 	virtual void _SetScissor(bool scissor) = 0;
 
-	virtual void _SetScissorParams(int x, int y, int width, int height) = 0;
+	virtual void _SetScissorParams(int32_t x, int32_t y, int32_t width, int32_t height) = 0;
 
 	virtual void _SetPointSprite(bool sprite) = 0;
 
@@ -355,7 +355,7 @@ public:
 	virtual void RenderPointBuffer(const VertexBuffer* buffer) = 0;
 
 	//! Draws a Rectangle
-	virtual void DrawRectangle(const Point2& position, const Point2& dimensions, int drawMode,
+	virtual void DrawRectangle(const Point2& position, const Point2& dimensions, int32_t drawMode,
 														 const Color4& borderColor = Color4::BLACK, const Color4& fillColor = Color4::WHITE) = 0;
 
 	virtual void AddDebugLine(const Vec3& start, const Vec3& end, const Color4& color) = 0;

src/Resource.h

@@ -57,7 +57,7 @@ class ResourceManager;
 	for referring to files on disk covered in Filesystem.
 
 	In order to save space and keep high performances, resource
-	names are stored as 64-bit long sting hashes.
+	names are stored as 64-bit int64_t sting hashes.
 */
 class Resource
 {

src/ResourceManager.h

@@ -52,25 +52,25 @@ public:
 	void		Unload(const char* name, bool reload);
 
 	Resource*	GetByName(const char* name);
-	int			GetResourceCount() const;
+	int32_t		GetResourceCount() const;
 
 	/**
 	 * Creates a generic resource with the given name.
 	 * If a resource with the same name already exists, the
 	 * already existent resource will be returned. In order
 	 * to distinguish between a newly created resource or a
-	 * pointer to an existing one, you have to check
+	 * point32_ter to an existing one, you have to check
 	 * at the value returned by 'created'.
 	 * @param name The name of the resource
 	 * @param created Returns true if newly created, false otherwise
-	 * @return A pointer to the created resource
+	 * @return A point32_ter to the created resource
 	 */
 
 	/**
 	 * Loads a generic resource from file.
 	 * The name of the file determines the name of the resource and vice-versa.
 	 * @param name Tha name of the resource
-	 * @return A pointer to the loaded resource
+	 * @return A point32_ter to the loaded resource
 	 */
 
 	/**
@@ -84,7 +84,7 @@ public:
 	/**
 	 * Destroys a generic resource with the given name.
 	 * Causes the manager to remove the resource from its
-	 * internal list.
+	 * int32_ternal list.
 	 * @note Destroying here is a misleading term since the
 	 * resource is not destroyed if there are other references
 	 * to it.
@@ -93,9 +93,9 @@ public:
 
 	/**
 	 * Returns a resource by its name.
-	 * If the resource does not exists, returns a null pointer.
+	 * If the resource does not exists, returns a null point32_ter.
 	 * @param name The name of the resource
-	 * @return A pointer to the resource
+	 * @return A point32_ter to the resource
 	 */
 
 	/**
@@ -111,7 +111,7 @@ protected:
 	virtual Resource*	CreateSpecific(const char* name) = 0;
 	virtual void		DestroySpecific(const char* name);
 
-	// Resource name -> Resource pointer
+	// Resource name -> Resource point32_ter
 	NameToResourceDict	mNameToResourceDict;
 };
 

src/SpriteAnimator.cpp

@@ -49,12 +49,12 @@ void SpriteAnimator::SetAngle(real angle)
 	mAngle = angle;
 }
 
-int SpriteAnimator::GetFrameIndex()
+int32_t SpriteAnimator::GetFrameIndex()
 {
 	return mFrameIndex;
 }
 
-void SpriteAnimator::SetFrameIndex(int index)
+void SpriteAnimator::SetFrameIndex(int32_t index)
 {
 	if (mSprite)
 	{
@@ -65,12 +65,12 @@ void SpriteAnimator::SetFrameIndex(int index)
 	}
 }
 
-void SpriteAnimator::SetFrameInterval(int interval)
+void SpriteAnimator::SetFrameInterval(int32_t int32_terval)
 {
-	mFrameInterval = interval;
-	if (mFrameCounter == 0 || mFrameCounter > interval)
+	mFrameInterval = int32_terval;
+	if (mFrameCounter == 0 || mFrameCounter > int32_terval)
 	{
-		mFrameCounter = interval;
+		mFrameCounter = int32_terval;
 	}
 }
 

src/SpriteAnimator.h

@@ -39,9 +39,9 @@ public:
 
 	void SetSprite(Sprite* sprite);
 	void SetAngle(real angle);
-	int GetFrameIndex();
-	void SetFrameIndex(int index);
-	void SetFrameInterval(int interval);
+	int32_t GetFrameIndex();
+	void SetFrameIndex(int32_t index);
+	void SetFrameInterval(int32_t int32_terval);
 	void SetScaleX(real scaleX);
 	void SetScaleY(real scaleY);
 
@@ -51,9 +51,9 @@ public:
 	
 private:
 	Sprite* mSprite;
-	int mFrameIndex;
-	int mFrameInterval;
-	int mFrameCounter;
+	int32_t mFrameIndex;
+	int32_t mFrameInterval;
+	int32_t mFrameCounter;
 	real mAngle;
 	real mScaleX;
 	real mScaleY;

src/Terrain.cpp

@@ -245,8 +245,8 @@ bool Terrain::TraceRay(const Ray& ray, Triangle& result, Triangle& tri2, real& d
 		tri.v3 = mVertices[mIndices[i + 2]];
 
 		real ret;
-		Vec3 intersectionPoint;
-		if (Intersection::TestRayTriangle(ray, tri, ret, intersectionPoint))
+		Vec3 int32_tersectionPoint32_t;
+		if (Intersection::TestRayTriangle(ray, tri, ret, int32_tersectionPoint32_t))
 		{
 			if (ret < minDist)
 			{
@@ -266,8 +266,8 @@ uint32_t Terrain::SnapToGrid(const Vec3& vertex)
 {
 	float minDist = 9999999.0f;
 	uint32_t indexToSnapped;
-	// Find the snapped point to input vertex
-	for (int i = 0; i < mVertexCount; i++)
+	// Find the snapped point32_t to input vertex
+	for (int32_t i = 0; i < mVertexCount; i++)
 	{
 		Vec3 tmp = mVertices[i];
 		Vec3 vertex2 = vertex;
@@ -358,14 +358,14 @@ void Terrain::BuildBrush(uint32_t width, uint32_t height, float smooth)
 	}
 }
 
-void Terrain::PlotCircle(int xx, int yy, int radius, int i)
+void Terrain::PlotCircle(int32_t xx, int32_t yy, int32_t radius, int32_t i)
 {
-	for (int i = 0; i < 256 * 256; i++)
+	for (int32_t i = 0; i < 256 * 256; i++)
 	{
 		mBrush[i] = 0;
 	}
 
-  int x, y;
+  int32_t x, y;
 
 	mBrushWidth = radius * 2;
 	mBrushHeight = radius * 2;

src/Terrain.h

@@ -68,7 +68,7 @@ public:
 	void		ApplyBrush(uint32_t x, uint32_t z, float scale);
 	void		ApplyBrush(const Vec3& xyz, float scale);
 
-	void		PlotCircle(int xx, int yy, int radius, int i);
+	void		PlotCircle(int32_t xx, int32_t yy, int32_t radius, int32_t i);
 
 	void		Render();
 
@@ -100,8 +100,8 @@ private:
 	uint32_t		mIndexCount;
 	uint16_t*		mIndices;
 
-	int			mBrushWidth;
-	int			mBrushHeight;
+	int32_t			mBrushWidth;
+	int32_t			mBrushHeight;
 	float		mBrush[MAX_BRUSH_SIZE * MAX_BRUSH_SIZE];
 };
 

src/TextRenderer.cpp

@@ -52,7 +52,7 @@ void TextRenderer::EndDraw()
 }
 
 //-----------------------------------------------------------------------------
-void TextRenderer::Draw(const Str& string, int x, int y, Font* font)
+void TextRenderer::Draw(const Str& string, int32_t x, int32_t y, Font* font)
 {
 	Renderer* renderer = GetDevice()->GetRenderer();
 	Font* mFont = font;
@@ -107,7 +107,7 @@ void TextRenderer::Draw(const Str& string, int x, int y, Font* font)
 }
 
 //-----------------------------------------------------------------------------
-void TextRenderer::GetStrDimensions(const Str& string, uint32_t start, uint32_t end, int& width, int& height)
+void TextRenderer::GetStrDimensions(const Str& string, uint32_t start, uint32_t end, int32_t& width, int32_t& height)
 {
 //	if (mFont != NULL)
 //	{
@@ -117,7 +117,7 @@ void TextRenderer::GetStrDimensions(const Str& string, uint32_t start, uint32_t
 //	height = 0;
 //	width = 0;
 
-//	//TODO: Should take baseline into account
+//	//TODO: Should take baseline int32_to account
 
 //	if (end == (uint32_t)-1)
 //		end = string.GetLength();
@@ -130,25 +130,25 @@ void TextRenderer::GetStrDimensions(const Str& string, uint32_t start, uint32_t
 
 //		glyph.GetMetrics(dummy, dummy, dummy, dummy, gwidth, gheight, advance, baseline);
 
-//		height = Math::Max(height, (int)gheight) + (int)Math::Abs(gheight - baseline);
+//		height = Math::Max(height, (int32_t)gheight) + (int32_t)Math::Abs(gheight - baseline);
 //		if (i < string.GetLength() - 1)
-//			width += (int)advance;
+//			width += (int32_t)advance;
 //		else
 //		{
-//			width += (int)gwidth;
+//			width += (int32_t)gwidth;
 //		}
 //	}
 }
 
 //-----------------------------------------------------------------------------
-int TextRenderer::GetStrIndexFromDimensions(const Str& string, uint32_t start, const Point2& position, Point2& charPosition)
+int32_t TextRenderer::GetStrIndexFromDimensions(const Str& string, uint32_t start, const Point2& position, Point2& charPosition)
 {
 //	if (mFont == NULL)
 //	{
 //		return -1;
 //	}
 
-//	int width = 0;
+//	int32_t width = 0;
 
 //	for (uint32_t i = start; i < string.GetLength(); i++)
 //	{
@@ -168,7 +168,7 @@ int TextRenderer::GetStrIndexFromDimensions(const Str& string, uint32_t start, c
 //			charPosition.y = 0;
 //			return i;
 //		}
-//		width += (int)advance;
+//		width += (int32_t)advance;
 //	}
 //	charPosition.x = width;
 //	charPosition.y = 0;
@@ -176,7 +176,7 @@ int TextRenderer::GetStrIndexFromDimensions(const Str& string, uint32_t start, c
 }
 
 //-----------------------------------------------------------------------------
-int TextRenderer::GetMaxTextHeight()
+int32_t TextRenderer::GetMaxTextHeight()
 {
 //	return mFont->_GetMaxTextHeight();
 }

src/TextRenderer.h

@@ -52,22 +52,22 @@ public:
 
 	void	BeginDraw();
 	void	EndDraw();
-	void	Draw(const Str& string, int x, int y, Font* font);
+	void	Draw(const Str& string, int32_t x, int32_t y, Font* font);
 
 			//! Returns the sizes in pixels of the given string, when rendered with the current font
-	void	GetStrDimensions(const Str& string, uint32_t start, uint32_t end, int& width, int& height);
+	void	GetStrDimensions(const Str& string, uint32_t start, uint32_t end, int32_t& width, int32_t& height);
 			//! Returns the character index of the character at the given position
-	int		GetStrIndexFromDimensions(const Str& string, uint32_t start, const Point2& position, Point2& charPosition);
+	int32_t		GetStrIndexFromDimensions(const Str& string, uint32_t start, const Point2& position, Point2& charPosition);
 			//! Returns the max height of the text in the current font
-	int		GetMaxTextHeight();
+	int32_t		GetMaxTextHeight();
 
 
-	void GetStrDimensions(const Str& string, int& width, int& height)
+	void GetStrDimensions(const Str& string, int32_t& width, int32_t& height)
 	{
 		GetStrDimensions(string, 0, -1, width, height);
 	}
 
-	void GetStrDimensions(const Str& string, uint32_t start, int& width, int& height)
+	void GetStrDimensions(const Str& string, uint32_t start, int32_t& width, int32_t& height)
 	{
 		GetStrDimensions(string, start, -1, width, height);
 	}

src/TextureManager.h

@@ -35,7 +35,7 @@ namespace crown
 {
 
 /**
- * Manages texture loading, note that this is only an interface,
+ * Manages texture loading, note that this is only an int32_terface,
  * the implementation is demanded to the renderer.
  */
 class TextureManager : public ResourceManager
@@ -58,11 +58,11 @@ public:
 	 * If a resource with the same name already exists, the
 	 * already existent resource will be returned. In order
 	 * to distinguish between a newly created resource or a
-	 * pointer to an existing one, you have to check
+	 * point32_ter to an existing one, you have to check
 	 * at the value returned by 'created'.
 	 * @param name The name of the resource
 	 * @param created Returns true if newly created, false otherwise
-	 * @return A pointer to the created resource
+	 * @return A point32_ter to the created resource
 	 */
 	virtual Texture* Create(const char* name, bool& created) = 0;
 
@@ -70,7 +70,7 @@ public:
 	 * Loads a texture resource from file.
 	 * The name of the file determines the name of the resource and vice-versa.
 	 * @param name Tha name of the resource
-	 * @return A pointer to the loaded resource
+	 * @return A point32_ter to the loaded resource
 	 */
 	virtual Texture* Load(const char* name, bool generateMipMaps = true) = 0;
 
@@ -79,7 +79,7 @@ public:
 	 * The name of the file determines the name of the resource and vice-versa.
 	 * @param name The name of the resource
 	 * @param colorKey The color to use as transparent color
-	 * @return A pointer to the loaded resource
+	 * @return A point32_ter to the loaded resource
 	 */
 	virtual Texture* Load(const char* name, bool generateMipMaps, Color4 colorKey) = 0;
 
@@ -88,7 +88,7 @@ public:
 	 * The name of the file determines the name of the resource and vice-versa.
 	 * @param name The name of the resource
 	 * @param greyscaleAlpha The name of the file to use as alpha
-	 * @return A pointer to the loaded resource
+	 * @return A point32_ter to the loaded resource
 	 */
 	virtual Texture* Load(const char* name, const char* greyscaleAlpha, bool generateMipMaps) = 0;
 

src/World.h

@@ -31,7 +31,7 @@ namespace crown
 /**
 	The game world.
 
-	World represents the place where interactions between all the
+	World represents the place where int32_teractions between all the
 	game entities occur. It holds the systems which 
 */
 class World
@@ -54,7 +54,7 @@ private:
 
 	float		mGravity;			// Gravity of the world in meters/seconds
 
-	Camera		mCamera;			// Camera (i.e. the point of view)
+	Camera		mCamera;			// Camera (i.e. the point32_t of view)
 	Skybox		mSkybox;			// The skybox
 };
 

src/core/Delegate.h

@@ -54,7 +54,7 @@ public:
 	 { mObject = static_cast<TClass*>(object); }
 
 	IDelegate<TResult>* Duplicate()
-	 { return new Delegate(mObject.GetPointer()); }
+	 { return new Delegate(mObject.GetPoint32_ter()); }
 
 protected:
 	TClass* mObject;
@@ -94,7 +94,7 @@ public:
 
 	virtual IDelegate<TResult>* Duplicate()
 	{
-		return new Delegate1(mObject.GetPointer(), mMethod, mDefaultArg0);
+		return new Delegate1(mObject.GetPoint32_ter(), mMethod, mDefaultArg0);
 	}
 
 	TArg0 GetDefaultArg0() const;
@@ -110,7 +110,7 @@ TResult Delegate1<TClass, TResult, TArg0>::Invoke()
 {
 	if (mObject.IsNull() || mMethod == NULL)
 		return TResult();
-	return (mObject.GetPointer()->*mMethod)(mDefaultArg0);
+	return (mObject.GetPoint32_ter()->*mMethod)(mDefaultArg0);
 }
 
 template<typename TClass, typename TResult, typename TArg0>
@@ -118,7 +118,7 @@ TResult Delegate1<TClass, TResult, TArg0>::Invoke(TArg0 arg0)
 {
 	if (mObject.IsNull() || mMethod == NULL)
 		return TResult();
-	return (mObject.GetPointer()->*mMethod)(arg0);
+	return (mObject.GetPoint32_ter()->*mMethod)(arg0);
 }
 
 template<typename TClass, typename TResult, typename TArg0>
@@ -164,7 +164,7 @@ public:
 
 	virtual IDelegate<TResult>* Duplicate()
 	{
-		return new Delegate2(mObject.GetPointer(), mMethod, mDefaultArg0, mDefaultArg1);
+		return new Delegate2(mObject.GetPoint32_ter(), mMethod, mDefaultArg0, mDefaultArg1);
 	}
 
 	TArg0 GetDefaultArg0() const;
@@ -182,7 +182,7 @@ TResult Delegate2<TClass, TResult, TArg0, TArg1>::Invoke()
 {
 	if (mObject.IsNull() || mMethod == NULL)
 		return TResult();
-	return (mObject.GetPointer()->*mMethod)(mDefaultArg0, mDefaultArg1);
+	return (mObject.GetPoint32_ter()->*mMethod)(mDefaultArg0, mDefaultArg1);
 }
 
 template<typename TClass, typename TResult, typename TArg0, typename TArg1>
@@ -190,7 +190,7 @@ TResult Delegate2<TClass, TResult, TArg0, TArg1>::Invoke(TArg0 arg0)
 {
 	if (mObject.IsNull() || mMethod == NULL)
 		return TResult();
-	return (mObject.GetPointer()->*mMethod)(arg0, mDefaultArg1);
+	return (mObject.GetPoint32_ter()->*mMethod)(arg0, mDefaultArg1);
 }
 
 template<typename TClass, typename TResult, typename TArg0, typename TArg1>
@@ -198,7 +198,7 @@ TResult Delegate2<TClass, TResult, TArg0, TArg1>::Invoke(TArg0 arg0, TArg1 arg1)
 {
 	if (mObject.IsNull() || mMethod == NULL)
 		return TResult();
-	return (mObject.GetPointer()->*mMethod)(arg0, arg1);
+	return (mObject.GetPoint32_ter()->*mMethod)(arg0, arg1);
 }
 
 template<typename TClass, typename TResult, typename TArg0, typename TArg1>
@@ -249,7 +249,7 @@ public:
 
 	virtual IDelegate<TResult>* Duplicate()
 	{
-		return new Delegate3(mObject.GetPointer(), mMethod, mDefaultArg0, mDefaultArg1, mDefaultArg2);
+		return new Delegate3(mObject.GetPoint32_ter(), mMethod, mDefaultArg0, mDefaultArg1, mDefaultArg2);
 	}
 
 	TArg0 GetDefaultArg0() const;
@@ -269,7 +269,7 @@ TResult Delegate3<TClass, TResult, TArg0, TArg1, TArg2>::Invoke()
 {
 	if (mObject.IsNull() || mMethod == NULL)
 		return TResult();
-	return (mObject.GetPointer()->*mMethod)(mDefaultArg0, mDefaultArg1, mDefaultArg2);
+	return (mObject.GetPoint32_ter()->*mMethod)(mDefaultArg0, mDefaultArg1, mDefaultArg2);
 }
 
 template<typename TClass, typename TResult, typename TArg0, typename TArg1, typename TArg2>
@@ -277,7 +277,7 @@ TResult Delegate3<TClass, TResult, TArg0, TArg1, TArg2>::Invoke(TArg0 arg0)
 {
 	if (mObject.IsNull() || mMethod == NULL)
 		return TResult();
-	return (mObject.GetPointer()->*mMethod)(arg0, mDefaultArg1, mDefaultArg2);
+	return (mObject.GetPoint32_ter()->*mMethod)(arg0, mDefaultArg1, mDefaultArg2);
 }
 
 template<typename TClass, typename TResult, typename TArg0, typename TArg1, typename TArg2>
@@ -285,7 +285,7 @@ TResult Delegate3<TClass, TResult, TArg0, TArg1, TArg2>::Invoke(TArg0 arg0, TArg
 {
 	if (mObject.IsNull() || mMethod == NULL)
 		return TResult();
-	return (mObject.GetPointer()->*mMethod)(arg0, arg1, mDefaultArg2);
+	return (mObject.GetPoint32_ter()->*mMethod)(arg0, arg1, mDefaultArg2);
 }
 
 template<typename TClass, typename TResult, typename TArg0, typename TArg1, typename TArg2>
@@ -293,7 +293,7 @@ TResult Delegate3<TClass, TResult, TArg0, TArg1, TArg2>::Invoke(TArg0 arg0, TArg
 {
 	if (mObject.IsNull() || mMethod == NULL)
 		return TResult();
-	return (mObject.GetPointer()->*mMethod)(arg0, arg1, arg2);
+	return (mObject.GetPoint32_ter()->*mMethod)(arg0, arg1, arg2);
 }
 
 template<typename TClass, typename TResult, typename TArg0, typename TArg1, typename TArg2>
@@ -351,7 +351,7 @@ public:
 
 	virtual IDelegate<TResult>* Duplicate()
 	{
-		return new Delegate4(mObject.GetPointer(), mMethod, mDefaultArg0, mDefaultArg1, mDefaultArg2, mDefaultArg3);
+		return new Delegate4(mObject.GetPoint32_ter(), mMethod, mDefaultArg0, mDefaultArg1, mDefaultArg2, mDefaultArg3);
 	}
 
 	TArg0 GetDefaultArg0() const;
@@ -373,7 +373,7 @@ TResult Delegate4<TClass, TResult, TArg0, TArg1, TArg2, TArg3>::Invoke()
 {
 	if (mObject.IsNull() || mMethod == NULL)
 		return TResult();
-	return (mObject.GetPointer()->*mMethod)(mDefaultArg0, mDefaultArg1, mDefaultArg2, mDefaultArg3);
+	return (mObject.GetPoint32_ter()->*mMethod)(mDefaultArg0, mDefaultArg1, mDefaultArg2, mDefaultArg3);
 }
 
 template<typename TClass, typename TResult, typename TArg0, typename TArg1, typename TArg2, typename TArg3>
@@ -381,7 +381,7 @@ TResult Delegate4<TClass, TResult, TArg0, TArg1, TArg2, TArg3>::Invoke(TArg0 arg
 {
 	if (mObject.IsNull() || mMethod == NULL)
 		return TResult();
-	return (mObject.GetPointer()->*mMethod)(arg0, mDefaultArg1, mDefaultArg2, mDefaultArg3);
+	return (mObject.GetPoint32_ter()->*mMethod)(arg0, mDefaultArg1, mDefaultArg2, mDefaultArg3);
 }
 
 template<typename TClass, typename TResult, typename TArg0, typename TArg1, typename TArg2, typename TArg3>
@@ -389,7 +389,7 @@ TResult Delegate4<TClass, TResult, TArg0, TArg1, TArg2, TArg3>::Invoke(TArg0 arg
 {
 	if (mObject.IsNull() || mMethod == NULL)
 		return TResult();
-	return (mObject.GetPointer()->*mMethod)(arg0, arg1, mDefaultArg2, mDefaultArg3);
+	return (mObject.GetPoint32_ter()->*mMethod)(arg0, arg1, mDefaultArg2, mDefaultArg3);
 }
 
 template<typename TClass, typename TResult, typename TArg0, typename TArg1, typename TArg2, typename TArg3>
@@ -397,7 +397,7 @@ TResult Delegate4<TClass, TResult, TArg0, TArg1, TArg2, TArg3>::Invoke(TArg0 arg
 {
 	if (mObject.IsNull() || mMethod == NULL)
 		return TResult();
-	return (mObject.GetPointer()->*mMethod)(arg0, arg1, arg2, mDefaultArg3);
+	return (mObject.GetPoint32_ter()->*mMethod)(arg0, arg1, arg2, mDefaultArg3);
 }
 
 template<typename TClass, typename TResult, typename TArg0, typename TArg1, typename TArg2, typename TArg3>
@@ -405,7 +405,7 @@ TResult Delegate4<TClass, TResult, TArg0, TArg1, TArg2, TArg3>::Invoke(TArg0 arg
 {
 	if (mObject.IsNull() || mMethod == NULL)
 		return TResult();
-	return (mObject.GetPointer()->*mMethod)(arg0, arg1, arg2, arg3);
+	return (mObject.GetPoint32_ter()->*mMethod)(arg0, arg1, arg2, arg3);
 }
 
 template<typename TClass, typename TResult, typename TArg0, typename TArg1, typename TArg2, typename TArg3>

src/core/Exceptions.h

@@ -59,11 +59,11 @@ private:
 	char* mMessage;
 };
 
-class NullPointerException: public Exception
+class NullPoint32_terException: public Exception
 {
 public:
-	NullPointerException(const char* message): Exception(message) { }
-	virtual ~NullPointerException() throw() { }
+	NullPoint32_terException(const char* message): Exception(message) { }
+	virtual ~NullPoint32_terException() throw() { }
 };
 
 class ArgumentException: public Exception

src/core/SignalSlot.h

@@ -73,7 +73,7 @@ MulticastEvent<TSource, TArg1>::MulticastEvent()
 template <typename TSource, typename TArg1>
 MulticastEvent<TSource, TArg1>::~MulticastEvent()
 {
-	for (int i=0; i<mHandlers.GetSize(); i++)
+	for (int32_t i=0; i<mHandlers.GetSize(); i++)
 	{
 		delete mHandlers[i];
 	}
@@ -82,7 +82,7 @@ MulticastEvent<TSource, TArg1>::~MulticastEvent()
 template <typename TSource, typename TArg1>
 void MulticastEvent<TSource, TArg1>::Fire(TSource* source, TArg1 arg1)
 {
-	for (int i=0; i<mHandlers.GetSize(); i++)
+	for (int32_t i=0; i<mHandlers.GetSize(); i++)
 	{
 		HandlerType* handler = mHandlers[i];
 		handler->Invoke(source, arg1);

src/core/Types.h

@@ -27,23 +27,19 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #include "Config.h"
 #include <cstddef>
+#include <stdint.h>
 
 namespace crown
 {
 
-typedef unsigned char			uint8_t;		// 8-bit
-typedef unsigned short int		uint16_t;		// 16-bit
-typedef unsigned int			uint32_t;		// 32-bit
-typedef unsigned long long int	uint64_t;		// 64-bit
-
 #ifdef CROWN_USE_FLOAT
 typedef float					real;
 #else
 typedef double					real;
 #endif
 
-typedef uint32_t					StrId32;	// 32-bit string hash
-typedef uint64_t					StrId64;	// 64-bit string hash
+typedef uint32_t				StrId32;	// 32-bit string hash
+typedef uint32_t				StrId64;	// 64-bit string hash
 
 #ifndef NULL
 #ifdef __cplusplus

src/core/WithProperties.h

@@ -60,7 +60,7 @@ public:
 	
 	virtual ~WithProperties()
 	{
-		for (int i=0; i<mProperties.GetSize(); i++)
+		for (int32_t i=0; i<mProperties.GetSize(); i++)
 		{
 			delete mProperties[i];
 		}
@@ -75,7 +75,7 @@ public:
 //		{
 //			return ToStr();
 //		}
-		for(int i = 0; i < mProperties.GetSize(); i++)
+		for(int32_t i = 0; i < mProperties.GetSize(); i++)
 		{
 			if (mProperties[i]->GetName() == name)
 			{
@@ -89,7 +89,7 @@ public:
 
 	virtual void SetPropertyValue(const Str& name, const Generic& value)
 	{
-		for(int i = 0; i < mProperties.GetSize(); i++)
+		for(int32_t i = 0; i < mProperties.GetSize(); i++)
 		{
 			if (mProperties[i]->GetName() == name)
 			{
@@ -118,7 +118,7 @@ public:
 
 	Property* GetProperty(const Str& name)
 	{
-		for(int i = 0; i < mProperties.GetSize(); i++)
+		for(int32_t i = 0; i < mProperties.GetSize(); i++)
 		{
 			if (mProperties[i]->GetName() == name)
 			{

src/core/bv/Box.h

@@ -37,7 +37,7 @@ namespace crown
 /**
 	Axially aligned bounding box.
 
-	Used mainly for collision detection and intersection tests.
+	Used mainly for collision detection and int32_tersection tests.
 */
 class Box
 {
@@ -62,10 +62,10 @@ public:
 	real			get_radius() const;										//!< Returns the radius
 	real			get_volume() const;										//!< Returns the volume
 
-	void			add_point(const Vec3& p);								//!< Adds a point to the aabb
+	void			add_point32_t(const Vec3& p);								//!< Adds a point32_t to the aabb
 	void			add_box(const Box& box);								//!< Adds a Box to the aabb
 
-	bool			contains_point(const Vec3& p) const;					//!< Returns whether point "p" is contained
+	bool			contains_point32_t(const Vec3& p) const;					//!< Returns whether point32_t "p" is contained
 
 	Vec3			get_vertex(uint32_t index) const;							//!< Returns a box's vertex
 	void			get_transformed(const Mat4& mat, Box& result) const;	//!< Returns the box trasformed according to "mat" matrix
@@ -121,7 +121,7 @@ inline void Box::set_max(const Vec3& max)
 }
 
 //-----------------------------------------------------------------------------
-inline void Box::add_point(const Vec3& p)
+inline void Box::add_point32_t(const Vec3& p)
 {
 	if (p.x < min.x)
 	{
@@ -189,7 +189,7 @@ inline void Box::add_box(const Box& box)
 }
 
 //-----------------------------------------------------------------------------
-inline bool Box::contains_point(const Vec3& p) const
+inline bool Box::contains_point32_t(const Vec3& p) const
 {
 	return (p.x > min.x && p.y > min.y && p.z > min.z &&
 		p.x < max.x && p.y < max.y && p.z < max.z);
@@ -290,7 +290,7 @@ inline void Box::get_transformed(const Mat4& mat, Box& result) const
 	for (uint32_t i = 1; i < 8; i++)
 	{
 		vertices[i] = mat * vertices[i];
-		result.add_point(vertices[i]);
+		result.add_point32_t(vertices[i]);
 	}
 }
 

src/core/bv/Circle.h

@@ -37,7 +37,7 @@ class Rect;
 /**
 	Circle.
 
-	Used mainly for collision detection and intersection tests.
+	Used mainly for collision detection and int32_tersection tests.
 */
 class Circle
 {

src/core/bv/Frustum.cpp

@@ -58,14 +58,14 @@ Frustum::~Frustum()
 }
 
 //-----------------------------------------------------------------------------
-bool Frustum::contains_point(const Vec3& point) const
+bool Frustum::contains_point32_t(const Vec3& point32_t) const
 {
-	if (mPlane[FP_LEFT].get_distance_to_point(point) < 0.0) return false;
-	if (mPlane[FP_RIGHT].get_distance_to_point(point) < 0.0) return false;
-	if (mPlane[FP_BOTTOM].get_distance_to_point(point) < 0.0) return false;
-	if (mPlane[FP_TOP].get_distance_to_point(point) < 0.0) return false;
-	if (mPlane[FP_NEAR].get_distance_to_point(point) < 0.0) return false;
-	if (mPlane[FP_FAR].get_distance_to_point(point) < 0.0) return false;
+	if (mPlane[FP_LEFT].get_distance_to_point32_t(point32_t) < 0.0) return false;
+	if (mPlane[FP_RIGHT].get_distance_to_point32_t(point32_t) < 0.0) return false;
+	if (mPlane[FP_BOTTOM].get_distance_to_point32_t(point32_t) < 0.0) return false;
+	if (mPlane[FP_TOP].get_distance_to_point32_t(point32_t) < 0.0) return false;
+	if (mPlane[FP_NEAR].get_distance_to_point32_t(point32_t) < 0.0) return false;
+	if (mPlane[FP_FAR].get_distance_to_point32_t(point32_t) < 0.0) return false;
 
 	return true;
 }
@@ -162,14 +162,14 @@ Box Frustum::to_box() const
 	Box tmp;
 	tmp.zero();
 
-	tmp.add_point(this->get_vertex(0));
-	tmp.add_point(this->get_vertex(1));
-	tmp.add_point(this->get_vertex(2));
-	tmp.add_point(this->get_vertex(3));
-	tmp.add_point(this->get_vertex(4));
-	tmp.add_point(this->get_vertex(5));
-	tmp.add_point(this->get_vertex(6));
-	tmp.add_point(this->get_vertex(7));
+	tmp.add_point32_t(this->get_vertex(0));
+	tmp.add_point32_t(this->get_vertex(1));
+	tmp.add_point32_t(this->get_vertex(2));
+	tmp.add_point32_t(this->get_vertex(3));
+	tmp.add_point32_t(this->get_vertex(4));
+	tmp.add_point32_t(this->get_vertex(5));
+	tmp.add_point32_t(this->get_vertex(6));
+	tmp.add_point32_t(this->get_vertex(7));
 
 	return tmp;
 }

src/core/bv/Frustum.h

@@ -57,7 +57,7 @@ public:
 				Frustum(const Frustum& frustum);		//!< Copy constructor
 				~Frustum();								//!< Destructor
 
-	bool		contains_point(const Vec3& point) const;	//!< Returns true if point intersects the frustum
+	bool		contains_point32_t(const Vec3& point32_t) const;	//!< Returns true if point32_t int32_tersects the frustum
 	Vec3		get_vertex(uint32_t index) const;			//!< Returns one of the eight frustum's corners
 
 	void		from_matrix(const Mat4& m);				//!< Builds the view frustum according to the matrix m

src/core/bv/Rect.cpp

@@ -30,16 +30,16 @@ namespace crown
 {
 
 //-----------------------------------------------------------------------------
-bool Rect::contains_point(const Vec2& point) const
+bool Rect::contains_point32_t(const Vec2& point32_t) const
 {
-	return (point.x >= min.x && point.y >= min.y &&
-			point.x <= max.x && point.y <= max.y);
+	return (point32_t.x >= min.x && point32_t.y >= min.y &&
+			point32_t.x <= max.x && point32_t.y <= max.y);
 }
 
 //-----------------------------------------------------------------------------
-bool Rect::intersects_rect(const Rect& Rect) const
+bool Rect::int32_tersects_rect(const Rect& Rect) const
 {
-	//return (contains_point(Rect.min) || contains_point(Rect.max));
+	//return (contains_point32_t(Rect.min) || contains_point32_t(Rect.max));
 	if (Rect.min.x > max.x || Rect.max.x < min.x || Rect.min.y > max.y || Rect.max.y < min.y)
 		return false;
 	return true;

src/core/bv/Rect.h

@@ -38,7 +38,7 @@ class Circle;
 /**
 	2D rectangle.
 
-	Used mainly for collision detection and intersection tests.
+	Used mainly for collision detection and int32_tersection tests.
 */
 class Rect
 {
@@ -63,8 +63,8 @@ public:
 	real			get_area() const;						//!< Returns the area
 	Vec2			get_size() const;						//!< Returns the diagonal
 
-	bool			contains_point(const Vec2& point) const;//!< Returns whether "point" is contained
-	bool			intersects_rect(const Rect& r) const;	//!< Returns whether intersects "r"
+	bool			contains_point32_t(const Vec2& point32_t) const;//!< Returns whether "point32_t" is contained
+	bool			int32_tersects_rect(const Rect& r) const;	//!< Returns whether int32_tersects "r"
 	void			set_from_center_and_dimensions(Vec2 center, real width, real height);	//!< Sets the Rect from a center and a width - height
 	void			get_vertices(Vec2 v[4]) const;			//!< Returns the four rect's vertices
 	Vec2			get_vertex(uint32_t index) const;			//!< Returns a rect's vertex

src/core/bv/Sphere.h

@@ -35,7 +35,7 @@ namespace crown
 /**
 	Sphere.
 
-	Used mainly for collision detection and intersection tests.
+	Used mainly for collision detection and int32_tersection tests.
 */
 class Sphere
 {
@@ -57,10 +57,10 @@ public:
 	void			set_center(const Vec3& center);				//!< Sets the center
 	void			set_radius(real radius);					//!< Sets the radius
 
-	void			add_point(const Vec3& p);					//!< Adds a point to the Sphere
+	void			add_point32_t(const Vec3& p);					//!< Adds a point32_t to the Sphere
 	void			add_sphere(const Sphere& s);				//!< Adds a Sphere to the Sphere
 
-	bool			contains_point(const Vec3& p) const;		//!< Returns whether point "p" is contained
+	bool			contains_point32_t(const Vec3& p) const;		//!< Returns whether point32_t "p" is contained
 };
 
 //-----------------------------------------------------------------------------
@@ -114,7 +114,7 @@ inline void Sphere::set_radius(real radius)
 }
 
 //-----------------------------------------------------------------------------
-inline void Sphere::add_point(const Vec3& p)
+inline void Sphere::add_point32_t(const Vec3& p)
 {
 	real dist = (p - c).squared_length();
 
@@ -139,7 +139,7 @@ inline void Sphere::add_sphere(const Sphere& s)
 }
 
 //-----------------------------------------------------------------------------
-inline bool Sphere::contains_point(const Vec3& p) const
+inline bool Sphere::contains_point32_t(const Vec3& p) const
 {
 	real dist = (p - c).squared_length();
 	return (dist < r * r);

src/core/containers/Array.h

@@ -51,10 +51,10 @@ public:
 	const T&				operator[](uint32_t index) const;
 
 	bool					empty() const;
-	uint32_t					size() const;
-	uint32_t					get_capacity() const;
+	uint32_t				size() const;
+	uint32_t				get_capacity() const;
 
-	uint32_t					push_back(const T& item);
+	uint32_t				push_back(const T& item);
 	void					pop_back();
 
 	void					clear();
@@ -69,7 +69,7 @@ public:
 private:
 
 	Allocator*				m_allocator;
-	uint32_t					m_count;			// The number of items
+	uint32_t				m_count;			// The number of items
 	T						m_array[SIZE];
 };
 
@@ -195,7 +195,7 @@ inline void Array<T, SIZE>::clear()
 }
 
 /**
-	Copies the content of other list into this.
+	Copies the content of other list int32_to this.
 */
 template <typename T, uint32_t SIZE>
 inline const Array<T, SIZE>& Array<T, SIZE>::operator=(const Array<T, SIZE>& b)

src/core/containers/Generic.cpp

@@ -46,9 +46,9 @@ Generic::~Generic()
 }
 
 //-----------------------------------------------------------------------------
-Generic::Generic(int value) : m_type(GT_INT)
+Generic::Generic(int32_t value) : m_type(GT_INT)
 {
-	m_data.int_value = value;
+	m_data.int32_t_value = value;
 }
 
 //-----------------------------------------------------------------------------
@@ -76,29 +76,29 @@ Generic::Generic(bool value) : m_type(GT_BOOL)
 }
 
 //-----------------------------------------------------------------------------
-bool Generic::as_int(int& out) const
+bool Generic::as_int32_t(int32_t& out) const
 {
 	if (m_type == GT_INT)
 	{
-		out = m_data.int_value;
+		out = m_data.int32_t_value;
 		return true;
 	}
 
 	if (m_type == GT_UINT)
 	{
-		out = (int)m_data.uint32_t_value;
+		out = (int32_t)m_data.uint32_t_value;
 		return true;
 	}
 
 	if (m_type == GT_USHORT)
 	{
-		out = (int)m_data.uint16_t_value;
+		out = (int32_t)m_data.uint16_t_value;
 		return true;
 	}
 
 	if (m_type == GT_FLOAT)
 	{
-		out = (int)m_data.float_value;
+		out = (int32_t)m_data.float_value;
 		return true;
 	}
 
@@ -112,10 +112,10 @@ bool Generic::as_int(int& out) const
 }
 
 //-----------------------------------------------------------------------------
-int Generic::as_int() const
+int32_t Generic::as_int32_t() const
 {
-	int value = 0;
-	as_int(value);
+	int32_t value = 0;
+	as_int32_t(value);
 	return value;
 }
 
@@ -124,7 +124,7 @@ bool Generic::as_uint32_t(uint32_t& out) const
 {
 	if (m_type == GT_INT)
 	{
-		out = (uint32_t)m_data.int_value;
+		out = (uint32_t)m_data.int32_t_value;
 		return true;
 	}
 
@@ -168,7 +168,7 @@ bool Generic::as_uint16_t(uint16_t& out) const
 {
 	if (m_type == GT_INT)
 	{
-		out = (uint16_t)m_data.int_value;
+		out = (uint16_t)m_data.int32_t_value;
 		return true;
 	}
 
@@ -212,7 +212,7 @@ bool Generic::as_float(float& out) const
 {
 	if (m_type == GT_INT)
 	{
-		out = (float)m_data.int_value;
+		out = (float)m_data.int32_t_value;
 		return true;
 	}
 
@@ -256,7 +256,7 @@ bool Generic::as_bool(bool& out) const
 {
 	if (m_type == GT_INT)
 	{
-		out = m_data.int_value==0?false:true;
+		out = m_data.int32_t_value==0?false:true;
 		return true;
 	}
 
@@ -307,7 +307,7 @@ bool Generic::operator==(const Generic& other)
 	switch (m_type)
 	{
 		case GT_INT:
-			return m_data.int_value == other.m_data.int_value;
+			return m_data.int32_t_value == other.m_data.int32_t_value;
 			break;
 		case GT_UINT:
 			return m_data.uint32_t_value == other.m_data.uint32_t_value;
@@ -337,7 +337,7 @@ const Generic& Generic::operator=(const Generic& other)
 	switch (m_type)
 	{
 		case GT_INT:
-			m_data.int_value = other.m_data.int_value;
+			m_data.int32_t_value = other.m_data.int32_t_value;
 			break;
 		case GT_UINT:
 			m_data.uint32_t_value = other.m_data.uint32_t_value;

src/core/containers/Generic.h

@@ -50,7 +50,7 @@ public:
 					Generic(const Generic& other);
 					~Generic();
 
-	explicit		Generic(int value);
+	explicit		Generic(int32_t value);
 	explicit		Generic(uint32_t value);
 	explicit		Generic(uint16_t value);
 	explicit		Generic(float value);
@@ -59,14 +59,14 @@ public:
 
 	inline Type		get_type() const { return m_type; }
 
-	bool			as_int(int& out) const;
-	int				as_int() const;
+	bool			as_int32_t(int32_t& out) const;
+	int32_t			as_int32_t() const;
 
 	bool			as_uint32_t(uint32_t& out) const;
-	uint32_t			as_uint32_t() const;
+	uint32_t		as_uint32_t() const;
 
 	bool			as_uint16_t(uint16_t& out) const;
-	uint16_t			as_uint16_t() const;
+	uint16_t	as_uint16_t() const;
 
 	bool			as_float(float& out) const;
 	float			as_float() const;
@@ -87,9 +87,9 @@ private:
 
 	union Data
 	{
-		int			int_value;
-		uint32_t		uint32_t_value;
-		uint16_t		uint16_t_value;
+		int32_t		int32_t_value;
+		uint32_t	uint32_t_value;
+		uint16_t	uint16_t_value;
 		float		float_value;
 		bool		bool_value;
 	};

src/core/containers/List.h

@@ -52,14 +52,14 @@ public:
 	const T&			operator[](uint32_t index) const;
 
 	bool				empty() const;
-	uint32_t				size() const;
-	uint32_t				capacity() const;
+	uint32_t			size() const;
+	uint32_t			capacity() const;
 	void				set_capacity(uint32_t capacity);
 	void				grow();
 
 	void				condense();
 
-	uint32_t				push_back(const T& item);
+	uint32_t			push_back(const T& item);
 	void				pop_back();
 	void				clear();
 
@@ -73,8 +73,8 @@ public:
 private:
 
 	Allocator*			m_allocator;
-	uint32_t				m_capacity;
-	uint32_t				m_size;
+	uint32_t			m_capacity;
+	uint32_t			m_size;
 	T*					m_array;
 };
 
@@ -275,7 +275,7 @@ inline void List<T>::clear()
 }
 
 /**
-	Copies the content of the other list into this.
+	Copies the content of the other list int32_to this.
 */
 template <typename T>
 inline const List<T>& List<T>::operator=(const List<T>& other)

src/core/containers/RBTree.h

@@ -85,7 +85,7 @@ public:
 	bool Contains(const TKey& key) const;
 	void Clear();
 
-	inline int GetSize() const
+	inline int32_t GetSize() const
 	{
 		return mSize;
 	}
@@ -97,7 +97,7 @@ protected:
 private:
 	Node* mRoot;
 	Node* mSentinel;
-	int mSize;
+	int32_t mSize;
 
 	Node* GetPredecessor(Node* n) const;
 	Node* GetSuccessor(Node* n) const;
@@ -111,7 +111,7 @@ private:
 	void InnerClear(Node* n);
 
 #ifdef RBTREE_VERIFY
-	int dbgVerify(Node* n) const;
+	int32_t dbgVerify(Node* n) const;
 #endif
 };
 
@@ -647,7 +647,7 @@ inline void RBTree<TKey, TValue>::RotateRight(Node* x)
 
 #ifdef RBTREE_VERIFY
 template<typename TKey, typename TValue>
-int RBTree<TKey, TValue>::dbgVerify(Node* n) const
+int32_t RBTree<TKey, TValue>::dbgVerify(Node* n) const
 {
 	if (n == mSentinel)
 	{
@@ -666,8 +666,8 @@ int RBTree<TKey, TValue>::dbgVerify(Node* n) const
 		assert(n->item.key < n->right->item.key);
 	}
 
-	int bhL = dbgVerify(n->left);
-	int bhR = dbgVerify(n->right);
+	int32_t bhL = dbgVerify(n->left);
+	int32_t bhR = dbgVerify(n->right);
 	assert(bhL == bhR);
 
 	if (n->color == BLACK)

src/core/containers/Str.h

@@ -50,7 +50,7 @@ public:
 	Str(const char* str);
 
 	//! Constructor
-	explicit Str(int n);
+	explicit Str(int32_t n);
 
 	//! Constructor
 	explicit Str(uint32_t n);
@@ -70,25 +70,25 @@ public:
 	//! Returns the Str's length
 	uint32_t GetLength() const;
 
-	//! Provides an interface for accessing Str's elements through an index
+	//! Provides an int32_terface for accessing Str's elements through an index
 	char operator[](uint32_t index) const;
 
 	Str& operator=(const Str& Str);
 	Str& operator=(char c);
 	Str& operator=(const char* str);
-	Str& operator=(int n);
+	Str& operator=(int32_t n);
 	Str& operator=(uint32_t n);
 	Str& operator=(float n);
 
 	Str operator+(const Str& b) const;
 	Str operator+(const char* str) const;
-	Str operator+(int n) const;
+	Str operator+(int32_t n) const;
 	Str operator+(uint32_t n) const;
 	Str operator+(float n) const;
 
 	Str& operator+=(const Str& b);
 	Str& operator+=(const char* str);
-	Str& operator+=(int n);
+	Str& operator+=(int32_t n);
 	Str& operator+=(uint32_t n);
 	Str& operator+=(float n);
 
@@ -119,13 +119,13 @@ public:
 	bool EndsWith(const Str& end) const;
 
 	//! Returns the index of the first occurrence of a character in this Str or -1 if not found
-	int FindFirst(char ch) const;
+	int32_t FindFirst(char ch) const;
 
 	//! Returns the index of the last occurrence of a character in this Str or -1 if not found
-	int FindLast(char ch) const;
+	int32_t FindLast(char ch) const;
 
 	//! Returns the index of the first occurrence of Str in this Str or -1 if not found
-	int Find(const Str& Str) const;
+	int32_t Find(const Str& Str) const;
 
 	//! Returns the subStr of this Str starting at position 'start' and ending at position 'end - 1'
 	Str GetSubstring(uint32_t start, uint32_t end) const;
@@ -146,7 +146,7 @@ public:
 	Str Trim();
 
 	//! Returns the number of occurrence of char 'ch' 
-	int GetOccurrenceCount(char ch) const;
+	int32_t GetOccurrenceCount(char ch) const;
 
 	char* c_str() const;
 
@@ -167,14 +167,14 @@ public:
 	static bool				IsWhitespace(char c);
 
 	static size_t			StrLen(const char* str);
-	static const char*		StrStr(const char* str1, const char* str2);
-	static int				StrCmp(const char* str1, const char* str2);
+	static const char*	StrStr(const char* str1, const char* str2);
+	static int32_t			StrCmp(const char* str1, const char* str2);
 	static char*			StrCpy(char* dest, const char* src);
 
-	static int				FindFirst(const char* str, char c);
-	static int				FindLast(const char* str, char c);
+	static int32_t			FindFirst(const char* str, char c);
+	static int32_t			FindLast(const char* str, char c);
 
-	bool					ParseInt(int* value) const;
+	bool					ParseInt(int32_t* value) const;
 	bool					ParseUInt(uint32_t* value) const;
 	bool					ParseFloat(float* value) const;
 
@@ -203,7 +203,7 @@ inline Str::Str(const char* str) : mLength(0), mText(0)
 	*this = str;
 }
 
-inline Str::Str(int n) : mLength(0), mText(0)
+inline Str::Str(int32_t n) : mLength(0), mText(0)
 {
 	*this = n;
 }
@@ -331,7 +331,7 @@ inline Str& Str::operator=(const char* str)
 	return *this;
 }
 
-inline Str& Str::operator=(int n)
+inline Str& Str::operator=(int32_t n)
 {
 	char tmp[12] = {0};
 	bool negative = false;
@@ -415,7 +415,7 @@ inline Str Str::operator+(const char* str) const
 	return *this + Str(str);
 }
 
-inline Str Str::operator+(int n) const
+inline Str Str::operator+(int32_t n) const
 {
 	return *this + Str(n);
 }
@@ -442,7 +442,7 @@ inline Str& Str::operator+=(const char* str)
 	return *this;
 }
 
-inline Str& Str::operator+=(int n)
+inline Str& Str::operator+=(int32_t n)
 {
 	*this = *this + n;
 	return *this;
@@ -569,7 +569,7 @@ inline bool Str::EndsWith(const Str& end) const
 	return true;
 }
 
-inline int Str::FindFirst(char ch) const
+inline int32_t Str::FindFirst(char ch) const
 {
 	for (uint32_t i = 0; i < mLength; i++)
 	{
@@ -582,7 +582,7 @@ inline int Str::FindFirst(char ch) const
 	return -1;
 }
 
-inline int Str::FindLast(char ch) const
+inline int32_t Str::FindLast(char ch) const
 {
 	for (uint32_t i = mLength; i > 0; i--)
 	{
@@ -595,7 +595,7 @@ inline int Str::FindLast(char ch) const
 	return -1;
 }
 
-inline int Str::Find(const Str& Str) const
+inline int32_t Str::Find(const Str& Str) const
 {
 	bool found = true;
 
@@ -744,8 +744,8 @@ inline void Str::Split(char ch, List<Str>& split) const
 
 inline Str Str::Trim()
 {
-	int beginIndex = 0;
-	int endIndex = mLength - 1;
+	int32_t beginIndex = 0;
+	int32_t endIndex = mLength - 1;
 
 	while (Str::IsWhitespace(mText[beginIndex]))
 	{
@@ -760,9 +760,9 @@ inline Str Str::Trim()
 	return GetSubstring(beginIndex, endIndex + 1);
 }
 
-inline int Str::GetOccurrenceCount(char ch) const
+inline int32_t Str::GetOccurrenceCount(char ch) const
 {
-	int count = 0;
+	int32_t count = 0;
 
 	for (uint32_t i = 0; i < mLength; i++)
 	{
@@ -785,7 +785,7 @@ inline Str operator+(const char* str, const Str& string)
 	return Str(str) + string;
 }
 
-inline bool Str::ParseInt(int* value) const
+inline bool Str::ParseInt(int32_t* value) const
 {
 	if (sscanf(mText, "%d", value) != 1)
 	{
@@ -939,7 +939,7 @@ inline const char* Str::StrStr(const char* str1, const char* str2)
 }
 
 //-----------------------------------------------------------------------------
-inline int Str::StrCmp(const char* str1, const char* str2)
+inline int32_t Str::StrCmp(const char* str1, const char* str2)
 {
 	return strcmp(str1, str2);
 }
@@ -951,7 +951,7 @@ inline char* Str::StrCpy(char* dest, const char* src)
 }
 
 //-----------------------------------------------------------------------------
-inline int Str::FindFirst(const char* str, char c)
+inline int32_t Str::FindFirst(const char* str, char c)
 {
 	assert(str != NULL);
 
@@ -969,7 +969,7 @@ inline int Str::FindFirst(const char* str, char c)
 }
 
 //-----------------------------------------------------------------------------
-inline int Str::FindLast(const char* str, char c)
+inline int32_t Str::FindLast(const char* str, char c)
 {
 	assert(str != NULL);
 

src/core/math/Color4.h

@@ -35,8 +35,8 @@ namespace crown
 /**
 	RGBA color.
 
-	Maintains 3 float values each representing a primary
-	color intensity. An extra component is used as transparency
+	Maint32_tains 3 float values each representing a primary
+	color int32_tensity. An extra component is used as transparency
 	coefficient. Each component ranges from 0.0 to 1.0; the higher
 	the value the brighter the color. An alpha value of 0.0 means
 	totally transparent while a value of 1.0 means totally opaque.
@@ -54,16 +54,16 @@ public:
 							~Color4();									//!< Destructor
 							Color4(const Color4& c);					//!< Copy constructor
 							Color4(float r, float g, float b);			//!< Construct from three values
-							Color4(int r, int g, int b);				//!< Construct from three values
+							Color4(int32_t r, int32_t g, int32_t b);				//!< Construct from three values
 							Color4(float r, float g, float b, float a); //!< Construct from four values
-							Color4(int r, int g, int b, int a);			//!< Construct from four values
+							Color4(int32_t r, int32_t g, int32_t b, int32_t a);			//!< Construct from four values
 	explicit				Color4(float c[4]);							//!< Construct from four values
-	explicit				Color4(uint32_t rgba);							//!< Construct from 32-bit integer (red at MSB, alpha at LSB)
+	explicit				Color4(uint32_t rgba);							//!< Construct from 32-bit int32_teger (red at MSB, alpha at LSB)
 
-	uint32_t					get_as_rgb() const;	//!< Returns the color as a single 32-bit packed value. (RGBA order, alpha assumed = 255)
-	uint32_t					get_as_bgr() const;	//!< Returns the color as a single 32-bit packed value. (ABGR order, alpha assumed = 255)
-	uint32_t					get_as_rgba() const;	//!< Returns the color as a single 32-bit packed value. (RGBA order)
-	uint32_t					get_as_abgr() const;	//!< Returns the color as a single 32-bit packed value. (ABGR order)
+	uint32_t				get_as_rgb() const;	//!< Returns the color as a single 32-bit packed value. (RGBA order, alpha assumed = 255)
+	uint32_t				get_as_bgr() const;	//!< Returns the color as a single 32-bit packed value. (ABGR order, alpha assumed = 255)
+	uint32_t				get_as_rgba() const;	//!< Returns the color as a single 32-bit packed value. (RGBA order)
+	uint32_t				get_as_abgr() const;	//!< Returns the color as a single 32-bit packed value. (ABGR order)
 
 	float					operator[](uint32_t i) const;					//!< Random access by index
 	float&					operator[](uint32_t i);							//!< Random access by index
@@ -80,8 +80,8 @@ public:
 	bool					operator==(const Color4& other) const;		//!< Equality operator
 	bool					operator!=(const Color4& other) const;		//!< Disequality operator
 
-	float*					to_float_ptr();								//!< Returns the pointer to the color's data.
-	const float*			to_float_ptr() const;							//!< Returns the pointer to the color's data.
+	float*					to_float_ptr();								//!< Returns the point32_ter to the color's data.
+	const float*			to_float_ptr() const;							//!< Returns the point32_ter to the color's data.
 	Str						to_str() const;								//!< Returns a Str containing the colors' components.
 
 	// SVG 1.0 color names
@@ -259,7 +259,7 @@ inline Color4::Color4(float r, float g, float b)
 }
 
 //-----------------------------------------------------------------------------
-inline Color4::Color4(int r, int g, int b)
+inline Color4::Color4(int32_t r, int32_t g, int32_t b)
 {
 	this->r = r * math::ONE_OVER_255;
 	this->g = g * math::ONE_OVER_255;
@@ -277,7 +277,7 @@ inline Color4::Color4(float r, float g, float b, float a)
 }
 
 //-----------------------------------------------------------------------------
-inline Color4::Color4(int r, int g, int b, int a)
+inline Color4::Color4(int32_t r, int32_t g, int32_t b, int32_t a)
 {
 	this->r = r * math::ONE_OVER_255;
 	this->g = g * math::ONE_OVER_255;

src/core/math/Interpolation.h

@@ -37,55 +37,55 @@ class Interpolation
 public:
 
 							/**
-								linear interpolation between a pair of values.
+								linear int32_terpolation between a pair of values.
 							@param start
 								The start value
 							@param end
 								The end value
 							@param t
-								An interval ranging from 0.0 to 1.0
+								An int32_terval ranging from 0.0 to 1.0
 							@return
-								The interpolated value
+								The int32_terpolated value
 							*/
 	template <typename T>
 	static T				linear(const T& p0, const T& p1, real t);
 
 							/**
-								cosine interpolation between a pair of values.
+								cosine int32_terpolation between a pair of values.
 							@param start
 								The start value
 							@param end
 								The end value
 							@param t
-								An interval ranging from 0.0 to 1.0
+								An int32_terval ranging from 0.0 to 1.0
 							@return
-								The interpolated value
+								The int32_terpolated value
 							*/
 	template <typename T>
 	static T				cosine(const T& p0, const T& p1, real t);
 
 							/**
-								cubic interpolation between a pair of values.
+								cubic int32_terpolation between a pair of values.
 							@param start
 								The start value
 							@param end
 								The end value
 							@param t
-								An interval ranging from 0.0 to 1.0
+								An int32_terval ranging from 0.0 to 1.0
 							@return
-								The interpolated value
+								The int32_terpolated value
 							*/
 	template <typename T>
 	static T				cubic(const T& p0, const T& p1, real t);
 
 							/**
-								bezier interpolation.
+								bezier int32_terpolation.
 							*/
 	template <typename T>
 	static T				bezier(const T& p1, const T& p2, const T& p3, const T& p4, real t);
 
 							/**
-								Catmull-Rom spline interpolation.
+								Catmull-Rom spline int32_terpolation.
 							*/
 	template <typename T>
 	static T				catmull_rom(const T& p0, const T& p1, const T& p2, const T& p3, real t);

src/core/math/Intersection.h

@@ -88,7 +88,7 @@ class Intersection
 
 public:
 
-	static bool TestRayPlane(const Ray& r, const Plane& p, real& distance, Vec3& intersectionPoint);
+	static bool TestRayPlane(const Ray& r, const Plane& p, real& distance, Vec3& inttersectionPoint_t);
 	static bool TestRaySphere(const Ray& r, const Sphere& s, real& distance, Vec3& intersectionPoint);
 	static bool TestRayBox(const Ray& r, const Box& b, real& distance, Vec3& intersectionPoint);
 	static bool TestRayTriangle(const Ray& r, const Triangle& t, real& distance, Vec3& intersectionPoint);
@@ -207,7 +207,7 @@ inline bool Intersection::TestRayBox(const Ray& r, const Box& b, real& distance,
 		}
 	}
 
-	// Possibly intersects
+	// Possibly int32_tersects
 	return true;
 
 	// TODO
@@ -218,7 +218,7 @@ inline bool Intersection::TestRayTriangle(const Ray& r, const Triangle& t, real&
 {
 	if (Intersection::TestRayPlane(r, t.to_plane(), distance, intersectionPoint))
 	{
-		if (t.contains_point(intersectionPoint))
+		if (t.contains_point32_t(intersectionPoint))
 		{
 			return true;
 		}
@@ -250,7 +250,7 @@ inline bool Intersection::TestPlane3(const Plane& p1, const Plane& p2, const Pla
 //-----------------------------------------------------------------------------
 inline bool Intersection::TestStaticSpherePlane(const Sphere& s, const Plane& p)
 {
-	if (math::abs(p.get_distance_to_point(s.c)) < s.r)
+	if (math::abs(p.get_distance_to_point32_t(s.c)) < s.r)
 	{
 		return true;
 	}
@@ -271,10 +271,10 @@ inline bool Intersection::TestDynamicSpherePlane(const Sphere& s, const Vec3& d,
 	const Vec3& sphereCenter = s.c;
 	const real sphereRadius = s.r;
 
-	real t0;	// Time at which the sphere intersects the plane remaining at the front side of the plane
-	real t1;	// Time at which the sphere intersects the plane remaining at the back side of the plane
+	real t0;	// Time at which the sphere int32_tersects the plane remaining at the front side of the plane
+	real t1;	// Time at which the sphere int32_tersects the plane remaining at the back side of the plane
 
-	real sphereToPlaneDistance = p.get_distance_to_point(sphereCenter);
+	real sphereToPlaneDistance = p.get_distance_to_point32_t(sphereCenter);
 	real planeNormalDotVelocity = p.n.dot(d);
 
 	if (planeNormalDotVelocity > 0.0)
@@ -325,8 +325,8 @@ inline bool Intersection::TestDynamicSphereTriangle(const Sphere& s, const Vec3&
 		return false;
 	}
 
-	// Check if the intersection point lies inside the triangle
-	if (tri.contains_point(intersectionPoint))
+	// Check if the int32_tersection point32_t lies inside the triangle
+	if (tri.contains_point32_t(intersectionPoint))
 	{
 		it = spherePlaneIt;
 		// intersectionPoint is already returned by the above call to TestDynamicSpherePlane
@@ -477,7 +477,7 @@ inline bool Intersection::TestDynamicSphereSphere(const Sphere& s1, const Vec3&
 	Vec3 e = cs - cm;
 	real r = s1.r + s2.r;
 
-	// If ||e|| < r, intersection occurs at t = 0
+	// If ||e|| < r, int32_tersection occurs at t = 0
 	if (e.length() < r)
 	{
 		it = 0.0;
@@ -488,7 +488,7 @@ inline bool Intersection::TestDynamicSphereSphere(const Sphere& s1, const Vec3&
 	real ed = e.dot(d);
 	real squared = (ed * ed) + (r * r) - e.dot(e);
 
-	// If the value inside the square root is neg, then no intersection
+	// If the value inside the square root is neg, then no int32_tersection
 	if (squared < 0.0)
 	{
 		return false;
@@ -497,7 +497,7 @@ inline bool Intersection::TestDynamicSphereSphere(const Sphere& s1, const Vec3&
 	real t = ed - math::sqrt(squared);
 	real l = (d2 - d1).length();
 
-	// If t < 0 || t > l, then non intersection in the considered period of time
+	// If t < 0 || t > l, then non int32_tersection in the considered period of time
 	if (t < 0.0 || t > l)
 	{
 		return false;
@@ -535,12 +535,12 @@ inline bool Intersection::TestDynamicBoxBox(const Box& b1, const Vec3& v1, const
 	// b2 == moving box
 	Vec3 d = v2 - v1;
 
-	// Start time of intersection along each axis
+	// Start time of int32_tersection aint64_t each axis
 	Vec3 tEnterXYZ(0.0, 0.0, 0.0);
-	// Stop time of intersection along each axis
+	// Stop time of int32_tersection aint64_t each axis
 	Vec3 tLeaveXYZ(1.0, 1.0, 1.0);
 
-	// If the resulting displacement equals zero, then fallback to static intersection test
+	// If the resulting displacement equals zero, then fallback to static int32_tersection test
 	if (math::equals(d.x, (real)0.0))
 	{
 		if (b1.min.x > b2.max.x || b1.max.x < b2.min.x)
@@ -565,7 +565,7 @@ inline bool Intersection::TestDynamicBoxBox(const Box& b1, const Vec3& v1, const
 		}
 	}
 
-	// Otherwise, compute the enter/leave times along each axis
+	// Otherwise, compute the enter/leave times aint64_t each axis
 	real oneOverD = (real)(1.0 / d.x);
 	tEnterXYZ.x = (b1.min.x - b2.max.x) * oneOverD;
 	tLeaveXYZ.x = (b1.max.x - b2.min.x) * oneOverD;
@@ -597,7 +597,7 @@ inline bool Intersection::TestDynamicBoxBox(const Box& b1, const Vec3& v1, const
 	real tEnter = math::max(tEnterXYZ.x, math::max(tEnterXYZ.y, tEnterXYZ.z));
 	real tLeave = math::min(tLeaveXYZ.x, math::min(tLeaveXYZ.y, tLeaveXYZ.z));
 
-	// If tEnter > 1, then there is no intersection in the period
+	// If tEnter > 1, then there is no int32_tersection in the period
 	// of time cosidered
 	if (tEnter > 1.0)
 	{
@@ -612,17 +612,17 @@ inline bool Intersection::TestDynamicBoxBox(const Box& b1, const Vec3& v1, const
 //-----------------------------------------------------------------------------
 inline bool Intersection::TestFrustumSphere(const Frustum& f, const Sphere& s)
 {
-	if (f.mPlane[0].get_distance_to_point(s.c) < -s.r || f.mPlane[1].get_distance_to_point(s.c) < -s.r)
+	if (f.mPlane[0].get_distance_to_point32_t(s.c) < -s.r || f.mPlane[1].get_distance_to_point32_t(s.c) < -s.r)
 	{
 		return false;
 	}
 
-	if (f.mPlane[2].get_distance_to_point(s.c) < -s.r || f.mPlane[3].get_distance_to_point(s.c) < -s.r)
+	if (f.mPlane[2].get_distance_to_point32_t(s.c) < -s.r || f.mPlane[3].get_distance_to_point32_t(s.c) < -s.r)
 	{
 		return false;
 	}
 
-	if (f.mPlane[4].get_distance_to_point(s.c) < -s.r || f.mPlane[5].get_distance_to_point(s.c) < -s.r)
+	if (f.mPlane[4].get_distance_to_point32_t(s.c) < -s.r || f.mPlane[5].get_distance_to_point32_t(s.c) < -s.r)
 	{
 		return false;
 	}
@@ -641,20 +641,20 @@ inline bool Intersection::TestFrustumBox(const Frustum& f, const Box& b)
 
 		for (uint32_t j = 0; j < 8; j++)
 		{
-			if (f.mPlane[i].get_distance_to_point(b.get_vertex(j)) < 0.0)
+			if (f.mPlane[i].get_distance_to_point32_t(b.get_vertex(j)) < 0.0)
 			{
 				vertexOutCount++;
 			}
 		}
 
-		// If all vertices are outside one face, then the box doesn't intersect the frustum
+		// If all vertices are outside one face, then the box doesn't int32_tersect the frustum
 		if (vertexOutCount == 8)
 		{
 			return false;
 		}
 	}
 
-	// If we are here, is because either the box intersects or it is contained in the frustum
+	// If we are here, is because either the box int32_tersects or it is contained in the frustum
 	return true;
 }
 
@@ -695,7 +695,7 @@ inline bool Intersection::TestDynamicCircleCircle(const Circle& c1, const Vec2&
 	Vec2 e = cs - cm;
 	real r = c1.r + c2.r;
 
-	// If ||e|| < r, intersection occurs at t = 0
+	// If ||e|| < r, int32_tersection occurs at t = 0
 	if (e.length() < r)
 	{
 		it = 0.0;
@@ -706,7 +706,7 @@ inline bool Intersection::TestDynamicCircleCircle(const Circle& c1, const Vec2&
 	real ed = e.dot(d);
 	real squared = (ed * ed) + (r * r) - e.dot(e);
 
-	// If the value inside the square root is neg, then no intersection
+	// If the value inside the square root is neg, then no int32_tersection
 	if (squared < 0.0)
 	{
 		return false;
@@ -715,7 +715,7 @@ inline bool Intersection::TestDynamicCircleCircle(const Circle& c1, const Vec2&
 	real t = ed - math::sqrt(squared);
 	real l = (d2 - d1).length();
 
-	// If t < 0 || t > l, then non intersection in the considered period of time
+	// If t < 0 || t > l, then non int32_tersection in the considered period of time
 	if (t < 0.0 || t > l)
 	{
 		return false;
@@ -840,7 +840,7 @@ inline bool Intersection::TestCircleRect(const Circle& c1, const Rect& r2, Vec2&
 		{
 			return false;
 		}
-		//The - is to point outwards
+		//The - is to point32_t outwards
 		penetration *= - (c1.r - len) / len;
 	}
 

src/core/math/Mat3.h

@@ -109,8 +109,8 @@ public:
 	Vec3				get_scale() const;							//!< Returns a Vec3 containing the matrix's scale portion
 	void				set_scale(const Vec3& scale);				//!< Fills the matrix's scale portion with the values contained in "scale"
 
-	real*				to_float_ptr();								//!< Returns the pointer to the matrix's data
-	const real*			to_float_ptr() const;						//!< Returns the pointer to the matrix's data
+	real*				to_float_ptr();								//!< Returns the point32_ter to the matrix's data
+	const real*			to_float_ptr() const;						//!< Returns the point32_ter to the matrix's data
 	Str					to_str() const;								//!< Returns a Str containing the matrix's components
 	Angles				to_angles() const;							//!< Returns an angles according to the matrix's rotation portion
 	Mat4				to_mat4() const;							//!< Returns a 4x4 matrix according to the matrix's rotation portion

src/core/math/Mat4.cpp

@@ -759,7 +759,7 @@ void Mat4::build_look_at_lh(const Vec3& pos, const Vec3& target, const Vec3& up)
 }
 
 //-----------------------------------------------------------------------------
-void Mat4::build_viewpoint_billboard(const Vec3& pos, const Vec3& target, const Vec3& up)
+void Mat4::build_viewpoint32_t_billboard(const Vec3& pos, const Vec3& target, const Vec3& up)
 {
 	Vec3 zAxis = target - pos;
 	zAxis.normalize();

src/core/math/Mat4.h

@@ -109,8 +109,8 @@ public:
 
 	void				build_look_at_rh(const Vec3& pos, const Vec3& target, const Vec3& up);	//!< Builds a "Righ-Handed look-at" matrix from a position, a target, and an up vector
 	void				build_look_at_lh(const Vec3& pos, const Vec3& target, const Vec3& up);	//!< Builds a "Left-Handed look-at" matrix from a position, a target, and an up vector
-	void				build_viewpoint_billboard(const Vec3& pos, const Vec3& target, const Vec3& up);	//!< Builds a "Viewpoint-Oriented billboard" matrix which can be used to make an object face a specific point in space
-	void				build_axis_billboard(const Vec3& pos, const Vec3& target, const Vec3& axis);	//!< Builds a "Arbitrary-Axis billboard" matrix which can be used to make an object face a specific point in space
+	void				build_viewpoint32_t_billboard(const Vec3& pos, const Vec3& target, const Vec3& up);	//!< Builds a "Viewpoint32_t-Oriented billboard" matrix which can be used to make an object face a specific point32_t in space
+	void				build_axis_billboard(const Vec3& pos, const Vec3& target, const Vec3& axis);	//!< Builds a "Arbitrary-Axis billboard" matrix which can be used to make an object face a specific point32_t in space
 
 	Mat4&				transpose();								//!< Transposes the matrix
 	Mat4				get_transposed() const;						//!< Returns the transposed of the matrix
@@ -126,8 +126,8 @@ public:
 	Vec3				get_scale() const;							//!< Returns a Vec3 containing the matrix's scale portion
 	void				set_scale(const Vec3& scale);				//!< Fills the matrix's scale portion with the values contained in "scale"
 
-	real*				to_float_ptr();								//!< Returns the pointer to the matrix's data
-	const real*			to_float_ptr() const;						//!< Returns the pointer to the matrix's data
+	real*				to_float_ptr();								//!< Returns the point32_ter to the matrix's data
+	const real*			to_float_ptr() const;						//!< Returns the point32_ter to the matrix's data
 	Angles				to_angles() const;							//!< Returns an angles according to the matrix's rotation portion
 	Mat3				to_mat3() const;							//!< Returns a 3x3 matrix according to the matrix's rotation portion
 	Quat				to_quat() const;							//!< Returns a quaternion according to the matrix's rotation portion

src/core/math/MathUtils.h

@@ -62,9 +62,9 @@ const double	DOUBLE_PRECISION			= (real)1.0e-9;
 bool			equals(float a, float b, float precision = FLOAT_PRECISION);
 bool			equals(double a, double b, double precision = DOUBLE_PRECISION);
 
-bool			test_bitmask(int value, int bitmask);	//!< Tests agains a specified bitmask and returns true only if all bits are satisfied
-int				set_bitmask(int value, int bitmask);	//!< Sets the specified bitmask
-int				unset_bitmask(int value, int bitmask);	//!< Removes the specified bitmask
+bool			test_bitmask(int32_t value, int32_t bitmask);	//!< Tests agains a specified bitmask and returns true only if all bits are satisfied
+int32_t			set_bitmask(int32_t value, int32_t bitmask);	//!< Sets the specified bitmask
+int32_t			unset_bitmask(int32_t value, int32_t bitmask);	//!< Removes the specified bitmask
 
 
 template <typename T> T		min(const T& a, const T& b);	//!< Returns minimum between two values
@@ -75,10 +75,10 @@ template <typename T> void	swap(T& a, T& b);				//!< Swaps @a and @b
 
 real			deg_to_rad(real deg);			//!< Returns "deg" in radians
 real			rad_to_deg(real rad);			//!< Returns "rad" in degrees
-uint32_t			next_pow_2(uint32_t x);				//!< Returns the nearest power of two to @x
-bool			is_pow_2(uint32_t x);				//!< Returns whether @x is power of two
-real			ceil(real x);					//!< Returns the smallest integral value that is not less than x
-real			floor(real x);					//!< Returns the largest integral value that is not greater than x
+uint32_t		next_pow_2(uint32_t x);			//!< Returns the nearest power of two to @x
+bool			is_pow_2(uint32_t x);			//!< Returns whether @x is power of two
+real			ceil(real x);					//!< Returns the smallest int32_tegral value that is not less than x
+real			floor(real x);					//!< Returns the largest int32_tegral value that is not greater than x
 real			sqrt(real x);					//!< Returns the square root of @x
 real			inv_sqrt(real x);				//!< Returns the inverse square root of @x
 real			sin(real x);					//!< Returns the sine of @x
@@ -88,7 +88,7 @@ real			acos(real x);					//!< Returns the arc cosine of @x
 real			tan(real x);					//!< Returns the tangent of @x
 real			atan2(real y, real x);			//!< Returns the arc tangent of @y/@x
 real			abs(real x);					//!< Returns the absolute value of @x
-real			fmod(real n, real d);			//!< Returns the realing-point remainder of numerator/denominator
+real			fmod(real n, real d);			//!< Returns the realing-point32_t remainder of numerator/denominator
 
 
 				//! Returns true if there are solutions and puts them in 'x1' and 'x2' (x1 <= x2)
@@ -107,19 +107,19 @@ inline bool equals(double a, double b, double precision)
 }
 
 //-----------------------------------------------------------------------------
-inline bool test_bitmask(int value, int bitmask)
+inline bool test_bitmask(int32_t value, int32_t bitmask)
 {
 	return (value & bitmask) == bitmask;
 }
 
 //-----------------------------------------------------------------------------
-inline int set_bitmask(int value, int bitmask)
+inline int32_t set_bitmask(int32_t value, int32_t bitmask)
 {
 	return value | bitmask;
 }
 
 //-----------------------------------------------------------------------------
-inline int unset_bitmask(int value, int bitmask)
+inline int32_t unset_bitmask(int32_t value, int32_t bitmask)
 {
 	return value & (~bitmask);
 }

src/core/math/Plane.cpp

@@ -74,13 +74,13 @@ Plane& Plane::normalize()
 }
 
 //-----------------------------------------------------------------------------
-real Plane::get_distance_to_point(const Vec3& p) const
+real Plane::get_distance_to_point32_t(const Vec3& p) const
 {
 	return n.dot(p) + d;
 }
 
 //-----------------------------------------------------------------------------
-bool Plane::contains_point(const Vec3& p) const
+bool Plane::contains_point32_t(const Vec3& p) const
 {
 	return math::equals(n.dot(p) + d, (real)0.0);
 }

src/core/math/Plane.h

@@ -52,8 +52,8 @@ public:
 
 	Plane&				normalize();								//!< Normalizes the plane
 
-	real				get_distance_to_point(const Vec3& p) const;	//!< Returns the signed distance between point "p" and the plane
-	bool				contains_point(const Vec3& p) const;		//!< Returns whether the plane contains the point
+	real				get_distance_to_point32_t(const Vec3& p) const;	//!< Returns the signed distance between point32_t "p" and the plane
+	bool				contains_point32_t(const Vec3& p) const;		//!< Returns whether the plane contains the point32_t
 
 	static const Plane	ZERO;
 	static const Plane	XAXIS;

src/core/math/Point2.h

@@ -36,56 +36,56 @@ namespace crown
 {
 
 /**
-	2D point.
+	2D point32_t.
 */
 class Point2
 {
 public:
 
-	int						x, y;
+	int32_t						x, y;
 
 							Point2();							//!< Constructor, does nothing for efficiency
-							Point2(int nx, int ny);				//! Constructs from two components
-							Point2(const int a[2]);				//! Constructs from the array
+							Point2(int32_t nx, int32_t ny);				//! Constructs from two components
+							Point2(const int32_t a[2]);				//! Constructs from the array
 							Point2(const Point2& a);			//! Copy constructor
 							~Point2();							//! Destructor
 
-	int						operator[](uint32_t i) const;			//! Random access by index
-	int&					operator[](uint32_t i);					//! Random access by index
+	int32_t					operator[](uint32_t i) const;			//! Random access by index
+	int32_t&				operator[](uint32_t i);					//! Random access by index
 
 	Point2					operator+(const Point2& a) const;	//! Addition
 	Point2&					operator+=(const Point2& a);		//! Addition
 	Point2					operator-(const Point2& a) const;	//! Subtraction
 	Point2&					operator-=(const Point2& a);		//! Subtraction
-	Point2					operator*(int k) const;				//! Multiplication by scalar
-	Point2&					operator*=(int k);					//! Multiplication by scalar
-	Point2					operator/(int k) const;				//! Division by scalar
-	Point2&					operator/=(int k);					//! Division by scalar
-	int						dot(const Point2& a);				//! dot product
+	Point2					operator*(int32_t k) const;				//! Multiplication by scalar
+	Point2&					operator*=(int32_t k);					//! Multiplication by scalar
+	Point2					operator/(int32_t k) const;				//! Division by scalar
+	Point2&					operator/=(int32_t k);					//! Division by scalar
+	int32_t						dot(const Point2& a);				//! dot product
 
-	friend Point2			operator*(int k, const Point2& a);	//! For simmetry
+	friend Point2			operator*(int32_t k, const Point2& a);	//! For simmetry
 
 	bool					operator==(const Point2& other) const;	//! Equality operator
 	bool					operator!=(const Point2& other) const;	//! Disequality operator
-	bool					operator<(const Point2& other) const;	//! Returns whether all the components of this point are smaller than all of the "other" point
-	bool					operator>(const Point2& other) const;	//! Returns whether all the components of this point are greater than all of the "other" point
+	bool					operator<(const Point2& other) const;	//! Returns whether all the components of this point32_t are smaller than all of the "other" point32_t
+	bool					operator>(const Point2& other) const;	//! Returns whether all the components of this point32_t are greater than all of the "other" point32_t
 
-	real					length() const;						//! Returns the point's length
-	int						squared_length() const;				//! Returns the point's squared length
-	void					negate();							//! Negates the point (i.e. builds the inverse)
+	real					length() const;						//! Returns the point32_t's length
+	int32_t					squared_length() const;				//! Returns the point32_t's squared length
+	void					negate();							//! Negates the point32_t (i.e. builds the inverse)
 
 	real					get_distance_to(const Point2& a);	//!< Returns the distance
 	real					get_angle_between(const Point2& a);	//!< Returns the angle in radians
 
-	Point2					operator-() const;					//! Negates the point (i.e. builds the inverse)
+	Point2					operator-() const;					//! Negates the point32_t (i.e. builds the inverse)
 
-	void					zero();								//! Builds the zero point
+	void					zero();								//! Builds the zero point32_t
 
-	int*					to_int_ptr();		//! Returns the pointer to the point's data
-	const int*				to_int_ptr() const;	//! Returns the pointer to the point's data
-	Vec2					to_vec2() const;	//! Returns a vector from this point
-	Vec3					to_vec3() const;	//! Returns a vector from this point
-	Str						to_str() const;		//! Returns a Str containing the point's components
+	int32_t*				to_int32_t_ptr();		//! Returns the point32_ter to the point32_t's data
+	const int32_t*			to_int32_t_ptr() const;	//! Returns the point32_ter to the point32_t's data
+	Vec2					to_vec2() const;	//! Returns a vector from this point32_t
+	Vec3					to_vec3() const;	//! Returns a vector from this point32_t
+	Str						to_str() const;		//! Returns a Str containing the point32_t's components
 
 	static const Point2		ZERO;
 	static const Point2		ONE;
@@ -99,12 +99,12 @@ inline Point2::Point2() : x(0), y(0)
 }
 
 //-----------------------------------------------------------------------------
-inline Point2::Point2(int nx, int ny) : x(nx), y(ny)
+inline Point2::Point2(int32_t nx, int32_t ny) : x(nx), y(ny)
 {
 }
 
 //-----------------------------------------------------------------------------
-inline Point2::Point2(const int a[2]) : x(a[0]), y(a[1])
+inline Point2::Point2(const int32_t a[2]) : x(a[0]), y(a[1])
 {
 }
 
@@ -119,7 +119,7 @@ inline Point2::~Point2()
 }
 
 //-----------------------------------------------------------------------------
-inline int Point2::operator[](uint32_t i) const
+inline int32_t Point2::operator[](uint32_t i) const
 {
 	assert(i < 2);
 
@@ -127,7 +127,7 @@ inline int Point2::operator[](uint32_t i) const
 }
 
 //-----------------------------------------------------------------------------
-inline int& Point2::operator[](uint32_t i)
+inline int32_t& Point2::operator[](uint32_t i)
 {
 	assert(i < 2);
 
@@ -165,13 +165,13 @@ inline Point2& Point2::operator-=(const Point2& a)
 }
 
 //-----------------------------------------------------------------------------
-inline Point2 Point2::operator*(int k) const
+inline Point2 Point2::operator*(int32_t k) const
 {
 	return Point2(x * k, y * k);
 }
 
 //-----------------------------------------------------------------------------
-inline Point2& Point2::operator*=(int k)
+inline Point2& Point2::operator*=(int32_t k)
 {
 	x *= k;
 	y *= k;
@@ -180,7 +180,7 @@ inline Point2& Point2::operator*=(int k)
 }
 
 //-----------------------------------------------------------------------------
-inline Point2 Point2::operator/(int k) const
+inline Point2 Point2::operator/(int32_t k) const
 {
 	assert(k != 0);
 
@@ -188,7 +188,7 @@ inline Point2 Point2::operator/(int k) const
 }
 
 //-----------------------------------------------------------------------------
-inline Point2& Point2::operator/=(int k)
+inline Point2& Point2::operator/=(int32_t k)
 {
 	assert(k != 0);
 
@@ -199,14 +199,14 @@ inline Point2& Point2::operator/=(int k)
 }
 
 //-----------------------------------------------------------------------------
-inline int Point2::dot(const Point2& a)
+inline int32_t Point2::dot(const Point2& a)
 {
 	return x * a.x + y * a.y;
 }
 
 
 //-----------------------------------------------------------------------------
-inline Point2 operator*(int k, const Point2& a)
+inline Point2 operator*(int32_t k, const Point2& a)
 {
 	return a * k;
 }
@@ -242,7 +242,7 @@ inline real Point2::length() const
 }
 
 //-----------------------------------------------------------------------------
-inline int Point2::squared_length() const
+inline int32_t Point2::squared_length() const
 {
 	return x * x + y * y;
 }
@@ -279,13 +279,13 @@ inline void Point2::zero()
 }
 
 //-----------------------------------------------------------------------------
-inline int* Point2::to_int_ptr()
+inline int32_t* Point2::to_int32_t_ptr()
 {
 	return &x;
 }
 
 //-----------------------------------------------------------------------------
-inline const int* Point2::to_int_ptr() const
+inline const int32_t* Point2::to_int32_t_ptr() const
 {
 	return &x;
 }

src/core/math/Quat.cpp

@@ -188,7 +188,7 @@ Quat Quat::power(real exp)
 }
 
 /*
-The geometric interpretation of the Quat dot product is similar to the interpretation of
+The geometric int32_terpretation of the Quat dot product is similar to the int32_terpretation of
 the vector dot product; the larger the absolute value of the Quat dot product axb, the more
 "similar" the angular displacements represented by a and b.
 */
@@ -197,7 +197,7 @@ real dot(const Quat& a, const Quat& b)
 	return a.w * b.w + a.v.dot(b.v);
 }
 
-// Spherical Linear intERPolation
+// Spherical Linear int32_tERPolation
 Quat slerp(const Quat& start, const Quat& end, real t)
 {
 	Quat delta = end * start.get_inverse();

src/core/math/Quat.h

@@ -42,10 +42,10 @@ class Mat4;
 	This implementation uses the standard quaternion
 	multiplication equation, so, the order of multiplication
 	for multiple rotations is in a reverse fashion:
-	p' = qpq^-1 where p is the point and q the rotation quaternion
+	p' = qpq^-1 where p is the point32_t and q the rotation quaternion
 
-	p' = (ba)p(ba)^-1 where p is the point and (ba) the concatenation of two successive rotations
-	In this case, the point p is first rotated by the quaternion a and then by the quaternion b.
+	p' = (ba)p(ba)^-1 where p is the point32_t and (ba) the concatenation of two successive rotations
+	In this case, the point32_t p is first rotated by the quaternion a and then by the quaternion b.
 	The transformation order is reversed.
 */
 class Quat

src/core/math/Random.h

@@ -37,24 +37,24 @@ class Random
 {
 public:
 
-			Random(int seed);	//!< Constructor
+			Random(int32_t seed);	//!< Constructor
 
-	int		get_int();			//!< Returns a pseudo-random integer in the range [0, 32767]
-	int		get_int(int max);	//!< Returns a pseudo-random integer in the range [0, max)
+	int32_t		get_int32_t();			//!< Returns a pseudo-random int32_teger in the range [0, 32767]
+	int32_t		get_int32_t(int32_t max);	//!< Returns a pseudo-random int32_teger in the range [0, max)
 	float	get_unit_float();	//!< Returns a pseudo-random float in the range [0.0, 1.0].
 
 private:
 
-	int		mSeed;
+	int32_t		mSeed;
 };
 
 //-----------------------------------------------------------------------------
-inline Random::Random(int seed) : mSeed(seed)
+inline Random::Random(int32_t seed) : mSeed(seed)
 {
 }
 
 //-----------------------------------------------------------------------------
-inline int Random::get_int()
+inline int32_t Random::get_int32_t()
 {
 	mSeed = 214013 * mSeed + 13737667;
 
@@ -62,15 +62,15 @@ inline int Random::get_int()
 }
 
 //-----------------------------------------------------------------------------
-inline int Random::get_int(int max)
+inline int32_t Random::get_int32_t(int32_t max)
 {
-	return (max == 0) ? 0 : get_int() % max;
+	return (max == 0) ? 0 : get_int32_t() % max;
 }
 
 //-----------------------------------------------------------------------------
 inline float Random::get_unit_float()
 {
-	return get_int() / (float) 0x7FFF;
+	return get_int32_t() / (float) 0x7FFF;
 }
 
 } // namespace crown

src/core/math/Triangle.h

@@ -49,9 +49,9 @@ public:
 
 	real		get_area() const;		//!< Returns the area
 	Vec3		get_centroid() const;	//!< Returns the center of gravity (a.k.a. centroid.)
-	Vec3		get_barycentric_coords(const Vec3& p) const;	//!< Returns the barycentric coordinates of point "p"
+	Vec3		get_barycentric_coords(const Vec3& p) const;	//!< Returns the barycentric coordinates of point32_t "p"
 
-	bool		contains_point(const Vec3& p) const;		//!< Returns whether the triangle contains the "p" point
+	bool		contains_point32_t(const Vec3& p) const;		//!< Returns whether the triangle contains the "p" point32_t
 
 	Plane		to_plane() const;		//!< Returns the plane containing the triangle
 };
@@ -113,7 +113,7 @@ inline Vec3 Triangle::get_barycentric_coords(const Vec3& p) const
 }
 
 //-----------------------------------------------------------------------------
-inline bool Triangle::contains_point(const Vec3& p) const
+inline bool Triangle::contains_point32_t(const Vec3& p) const
 {
 	Vec3 bc = get_barycentric_coords(p);
 

src/core/math/Vec2.h

@@ -82,8 +82,8 @@ public:
 
 	void				zero();									//!< Builds the zero vector
 
-	real*				to_float_ptr();							//!< Returns the pointer to the vector's data
-	const real*			to_float_ptr() const;						//!< Returns the pointer to the vector's data
+	real*				to_float_ptr();							//!< Returns the point32_ter to the vector's data
+	const real*			to_float_ptr() const;						//!< Returns the point32_ter to the vector's data
 	Str					to_str() const;							//!< Returns a Str containing the vector's components
 
 	static const Vec2	ZERO;

src/core/math/Vec3.h

@@ -84,8 +84,8 @@ public:
 
 	void				zero();									//!< Builds the zero vector
 
-	real*				to_float_ptr();							//!< Returns the pointer to the vector's data
-	const real*			to_float_ptr() const;					//!< Returns the pointer to the vector's data
+	real*				to_float_ptr();							//!< Returns the point32_ter to the vector's data
+	const real*			to_float_ptr() const;					//!< Returns the point32_ter to the vector's data
 	Vec2				to_vec2() const;						//!< Returns a Vec2 with only x and y coordinates
 	Str					to_str() const;							//!< Returns a Str containing the vector's components
 

src/core/math/Vec4.h

@@ -82,8 +82,8 @@ public:
 
 	void				zero();										//!< Builds the zero vector
 
-	real*				to_float_ptr();								//!< Returns the pointer to the vector's data
-	const real*			to_float_ptr() const;							//!< Returns the pointer to the vector's data
+	real*				to_float_ptr();								//!< Returns the point32_ter to the vector's data
+	const real*			to_float_ptr() const;							//!< Returns the point32_ter to the vector's data
 	Str					to_str() const;								//!< Returns a Str containing the vector's components
 
 	static const Vec4	ZERO;

src/core/mem/Memory.h

@@ -38,7 +38,7 @@ namespace memory
 const uint32_t	PADDING_VALUE	= 0xFFFFFFFFu;	//!< Value used to fill unused memory
 const size_t	DEFAULT_ALIGN	= 4;			//!< Default memory alignment in bytes
 
-//! Returns the pointer p aligned to the desired align
+//! Returns the point32_ter p aligned to the desired align
 inline void* align(void* p, size_t align)
 {
 	uintptr_t ptr = (uintptr_t)p;

src/core/streams/FileStream.cpp

@@ -107,8 +107,8 @@ bool FileStream::CopyTo(Stream* stream, size_t size)
 
 	while (totReadBytes < size)
 	{
-		int readBytes;
-		int expectedReadBytes = math::min(size - totReadBytes, chunksize);
+		int32_t readBytes;
+		int32_t expectedReadBytes = math::min(size - totReadBytes, chunksize);
 		readBytes = fread(buff, 1, expectedReadBytes, mFile->GetHandle());
 
 		if (readBytes < expectedReadBytes)
@@ -179,7 +179,7 @@ void FileStream::Flush()
 	fflush(mFile->GetHandle());
 }
 
-void FileStream::Seek(int newPos, SeekMode mode)
+void FileStream::Seek(int32_t newPos, SeekMode mode)
 {
 	CheckValid();
 	//flush(); <<<---?

src/core/streams/FileStream.h

@@ -55,7 +55,7 @@ public:
 					*/
 	virtual			~FileStream();
 					/** @copydoc Stream::Seek() */
-	void			Seek(int newPos, SeekMode mode);
+	void			Seek(int32_t newPos, SeekMode mode);
 					/** @copydoc Stream::ReadByte() */
 	uint8_t			ReadByte();
 					/** @copydoc Stream::ReadDataBlock() */

src/core/streams/FileSubStream.cpp

@@ -107,7 +107,7 @@ bool FileSubStream::CopyTo(Stream* stream, size_t size)
 		return false;
 	}
 
-	const int chunksize = 1024*1024;
+	const int32_t chunksize = 1024*1024;
 
 	char* buff = new char[chunksize];
 
@@ -115,7 +115,7 @@ bool FileSubStream::CopyTo(Stream* stream, size_t size)
 
 	while (size == 0 || totReadBytes < size)
 	{
-		int readBytes;
+		int32_t readBytes;
 		readBytes = fread(buff, 1, chunksize, mFile->GetHandle());
 
 		if (readBytes < chunksize)
@@ -171,7 +171,7 @@ void FileSubStream::Flush()
 	fflush(mFile->GetHandle());
 }
 
-void FileSubStream::Seek(int newPos, SeekMode mode)
+void FileSubStream::Seek(int32_t newPos, SeekMode mode)
 {
 	CheckValid();
 	//flush(); <<<---?

src/core/streams/FileSubStream.h

@@ -50,7 +50,7 @@ public:
 	virtual ~FileSubStream();
 
 	/** @copydoc Stream::Seek() */
-	void Seek(int newPos, SeekMode mode);
+	void Seek(int32_t newPos, SeekMode mode);
 
 	/** @copydoc Stream::ReadByte() */
 	uint8_t ReadByte();

src/core/streams/MemoryStream.cpp

@@ -110,7 +110,7 @@ MemoryStream::~MemoryStream()
 	}
 }
 
-void MemoryStream::Seek(int newPos, SeekMode mode)
+void MemoryStream::Seek(int32_t newPos, SeekMode mode)
 {
 	CheckValid();
 	

src/core/streams/MemoryStream.h

@@ -91,7 +91,7 @@ public:
 						MemoryStream(MemoryBuffer* f, StreamOpenMode openMode);
 	virtual				~MemoryStream();
 
-	void				Seek(int newPos, SeekMode mode);
+	void				Seek(int32_t newPos, SeekMode mode);
 
 	uint8_t				ReadByte();
 	void				ReadDataBlock(void* buffer, size_t size);

src/core/streams/NullStream.h

@@ -33,8 +33,7 @@ namespace crown
 /**
 	Bit bucket stream.
 
-	Discards all data written to it and provides null data
-	reading from it; plain and simple.
+	Discards all data written to it and provides null data reading from it; plain and simple.
 */
 class NullStream: public Stream
 {
@@ -46,7 +45,7 @@ public:
 				/** @copydoc Stream::~Stream() */
 	virtual		~NullStream() {}
 				/** @copydoc Stream::Seek() */
-	void		Seek(int /*newPos*/, uint8_t /*mode*/) {}
+	void		Seek(int32_t /*newPos*/, uint8_t /*mode*/) {}
 				/**
 				@copydoc Stream::ReadByte()
 				@note

src/core/streams/Stream.cpp

@@ -34,7 +34,7 @@ namespace crown
 bool Stream::ZipTo(Stream* stream, size_t size, size_t& zippedSize)
 {
 	const size_t CHUNK_SIZE = 16384;
-	int ret, flush;
+	int32_t ret, flush;
 	unsigned have;
 	z_stream strm;
 	unsigned char in[CHUNK_SIZE];
@@ -87,7 +87,7 @@ bool Stream::ZipTo(Stream* stream, size_t size, size_t& zippedSize)
 bool Stream::UnzipTo(Stream* stream, size_t& /*unzippedSize*/)
 {
 	const size_t CHUNK_SIZE = 16384;
-	int ret;
+	int32_t ret;
 	unsigned have;
 	z_stream strm;
 	unsigned char in[CHUNK_SIZE];
@@ -155,17 +155,17 @@ BinaryReader::~BinaryReader()
 {
 }
 
-uint8_t BinaryReader::ReadByte()
+int8_t BinaryReader::ReadByte()
 {
-	uint8_t buffer;
-	mStream->ReadDataBlock(&buffer, sizeof(uint8_t));
+	int8_t buffer;
+	mStream->ReadDataBlock(&buffer, sizeof(int8_t));
 	return buffer;
 }
 
-short BinaryReader::ReadInt16()
+int16_t BinaryReader::ReadInt16()
 {
-	short buffer;
-	mStream->ReadDataBlock(&buffer, sizeof(short));
+	int16_t buffer;
+	mStream->ReadDataBlock(&buffer, sizeof(int16_t));
 	return buffer;
 }
 
@@ -176,10 +176,10 @@ uint16_t BinaryReader::ReadUint16()
 	return buffer;
 }
 
-int BinaryReader::ReadInt32()
+int32_t BinaryReader::ReadInt32()
 {
-	int buffer;
-	mStream->ReadDataBlock(&buffer, sizeof(int));
+	int32_t buffer;
+	mStream->ReadDataBlock(&buffer, sizeof(int32_t));
 	return buffer;
 }
 
@@ -190,10 +190,10 @@ uint32_t BinaryReader::ReadUint32()
 	return buffer;
 }
 
-long long BinaryReader::ReadInt64()
+int64_t BinaryReader::ReadInt64()
 {
-	long long buffer;
-	mStream->ReadDataBlock(&buffer, sizeof(long long));
+	int64_t buffer;
+	mStream->ReadDataBlock(&buffer, sizeof(int64_t));
 	return buffer;
 }
 
@@ -221,14 +221,14 @@ BinaryWriter::~BinaryWriter()
 {
 }
 
-void BinaryWriter::WriteByte(uint8_t buffer)
+void BinaryWriter::WriteByte(int8_t buffer)
 {
-	mStream->WriteDataBlock(&buffer, sizeof(uint8_t));
+	mStream->WriteDataBlock(&buffer, sizeof(int8_t));
 }
 
-void BinaryWriter::WriteInt16(short buffer)
+void BinaryWriter::WriteInt16(int16_t buffer)
 {
-	mStream->WriteDataBlock(&buffer, sizeof(short));
+	mStream->WriteDataBlock(&buffer, sizeof(int16_t));
 }
 
 void BinaryWriter::WriteUint16(uint16_t buffer)
@@ -236,9 +236,9 @@ void BinaryWriter::WriteUint16(uint16_t buffer)
 	mStream->WriteDataBlock(&buffer, sizeof(uint16_t));
 }
 
-void BinaryWriter::WriteInt32(int buffer)
+void BinaryWriter::WriteInt32(int32_t buffer)
 {
-	mStream->WriteDataBlock(&buffer, sizeof(int));
+	mStream->WriteDataBlock(&buffer, sizeof(int32_t));
 }
 
 void BinaryWriter::WriteUint32(uint32_t buffer)
@@ -246,9 +246,9 @@ void BinaryWriter::WriteUint32(uint32_t buffer)
 	mStream->WriteDataBlock(&buffer, sizeof(uint32_t));
 }
 
-void BinaryWriter::WriteInt64(long long buffer)
+void BinaryWriter::WriteInt64(int64_t buffer)
 {
-	mStream->WriteDataBlock(&buffer, sizeof(long long));
+	mStream->WriteDataBlock(&buffer, sizeof(int64_t));
 }
 
 void BinaryWriter::WriteDouble(double buffer)
@@ -261,10 +261,10 @@ void BinaryWriter::WriteFloat(float buffer)
 	mStream->WriteDataBlock(&buffer, sizeof(float));
 }
 
-void BinaryWriter::InsertByte(uint8_t val, size_t offset)
+void BinaryWriter::InsertByte(int8_t val, size_t offset)
 {
 	size_t tmpSize = mStream->GetSize() - offset;
-	uint8_t* tmp = new uint8_t[tmpSize];
+	int8_t* tmp = new int8_t[tmpSize];
 	mStream->Seek(offset, SM_SeekFromBegin);
 	mStream->ReadDataBlock(tmp, tmpSize);
 	mStream->Seek(offset, SM_SeekFromBegin);
@@ -287,10 +287,10 @@ char TextReader::ReadChar()
 	return mStream->ReadByte();
 }
 
-char* TextReader::ReadString(char* string, int count)
+char* TextReader::ReadString(char* string, int32_t count)
 {
 	char currentChar;
-	int i = 0;
+	int32_t i = 0;
 
 	while(!mStream->EndOfStream() && i < count - 1)
 	{

src/core/streams/Stream.h

@@ -49,7 +49,7 @@ enum StreamOpenMode
 
 	It represents a flow of data attached to a 'file' which can be an archived file,
 	a regular file, a location in memory or anything that can be read or wrote.
-	A Stream is an abstraction to interact with these in an uniform way; every stream
+	A Stream is an abstraction to int32_teract with these in an uniform way; every stream
 	comes with a convenient set of methods to facilitate reading from it, writing to
 	it and so on.
 */
@@ -75,7 +75,7 @@ public:
 						@param mode
 							Position from where to move
 						*/
-	virtual void		Seek(int newPos, SeekMode mode) = 0;
+	virtual void		Seek(int32_t newPos, SeekMode mode) = 0;
 						/**
 							Reads a byte from the stream starting at current position.
 						@return
@@ -85,7 +85,7 @@ public:
 						/**
 							Reads a block of data from the stream.
 						@param buffer
-							Pointer to a block of memory of size 'size'
+							Point32_ter to a block of memory of size 'size'
 						@param size
 							The number of bytes to read
 						*/
@@ -127,7 +127,7 @@ public:
 						/**
 							Writes a block of data to the stream.
 						@param buffer
-							Pointer to a block of memory of size 'size'
+							Pointter to a block of memory of size 'size'
 						@param size
 							The number of bytes to write
 						*/
@@ -203,12 +203,12 @@ public:
 						BinaryReader(Stream* s);
 	virtual				~BinaryReader();
 
-	uint8_t				ReadByte();
-	short				ReadInt16();
-	uint16_t				ReadUint16();
-	int					ReadInt32();
-	uint32_t				ReadUint32();
-	long long			ReadInt64();
+	int8_t				ReadByte();
+	int16_t				ReadInt16();
+	uint16_t			ReadUint16();
+	int32_t				ReadInt32();
+	uint32_t			ReadUint32();
+	int64_t				ReadInt64();
 	double				ReadDouble();
 	float				ReadFloat();
 
@@ -229,16 +229,16 @@ public:
 						BinaryWriter(Stream* s);
 	virtual				~BinaryWriter();
 
-	void				WriteByte(uint8_t);
-	void				WriteInt16(short);
+	void				WriteByte(int8_t);
+	void				WriteInt16(int16_t);
 	void				WriteUint16(uint16_t);
-	void				WriteInt32(int);
+	void				WriteInt32(int32_t);
 	void				WriteUint32(uint32_t);
-	void				WriteInt64(long long);
+	void				WriteInt64(int64_t);
 	void				WriteDouble(double);
 	void				WriteFloat(float);
 
-	void				InsertByte(uint8_t val, size_t offset);
+	void				InsertByte(int8_t val, size_t offset);
 
 	inline Stream*		GetStream() { return mStream; }
 	inline void			SetStream(Stream* stream) { mStream = stream; }
@@ -260,7 +260,7 @@ public:
 	char				ReadChar();
 						/**
 							Reads characters from stream and stores them as a C string
-							into string until (count-1) characters have been read or
+							int32_to string until (count-1) characters have been read or
 							either a newline or the End-of-Stream is reached, whichever
 							comes first.
 							A newline character makes fgets stop reading, but it is considered
@@ -268,7 +268,7 @@ public:
 							A null character is automatically appended in str after the characters read to
 							signal the end of the C string.
 						*/
-	char*				ReadString(char* string, int count);
+	char*				ReadString(char* string, int32_t count);
 
 	inline Stream*		GetStream() { return mStream; }
 	inline void			SetStream(Stream* stream) { mStream = stream; }
@@ -289,7 +289,7 @@ public:
 
 	void				WriteChar(char c);
 						/**
-							Writes the string pointed by string to the stream.
+							Writes the string point32_ted by string to the stream.
 							The function begins copying from the address specified (string)
 							until it reaches the terminating null character ('\0').
 							This final null character is not copied to the stream.

src/input/InputManager.cpp

@@ -162,7 +162,7 @@ void InputManager::set_cursor_relative_xy(const Vec2& position)
 
 	os::get_render_window_metrics(window_width, window_height);
 
-	set_cursor_xy(Point2((int)(position.x * (float) window_width), (int)(position.y * (float) window_height)));
+	set_cursor_xy(Point2((int32_t)(position.x * (float) window_width), (int32_t)(position.y * (float) window_height)));
 }
 
 //-----------------------------------------------------------------------------

src/input/Mouse.h

@@ -25,8 +25,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #pragma once
 
-#include "Point2.h"
-#include "Vec2.h"
+#include "Types.h"
 
 namespace crown
 {
@@ -46,8 +45,8 @@ enum MouseButton
 struct MouseEvent
 {
 	MouseButton button;
-	int x;
-	int y;
+	int32_t x;
+	int32_t y;
 	float wheel;
 };
 

src/input/Touch.h

@@ -32,9 +32,9 @@ class InputManager;
 
 struct TouchEvent
 {
-	int pointer_id;
-	int x;
-	int y;
+	int32_t point32_ter_id;
+	int32_t x;
+	int32_t y;
 };
 
 class TouchListener

src/loaders/BMPImageLoader.cpp

@@ -41,14 +41,14 @@ namespace crown
 struct BitmapInfoHeader
 {
 	uint32_t biSize;
-	int  biWidth;
-	int  biHeight;
+	int32_t  biWidth;
+	int32_t  biHeight;
 	uint16_t biPlanes;
 	uint16_t biBitCount;
 	uint32_t biCompression;
 	uint32_t biSizeImage;
-	int  biXPelsPerMeter;
-	int  biYPelsPerMeter;
+	int32_t  biXPelsPerMeter;
+	int32_t  biYPelsPerMeter;
 	uint32_t biClrUsed;
 	uint32_t biClrImportant;
 };
@@ -79,9 +79,9 @@ Image* BMPImageLoader::LoadFile(const char* relativePath)
 
 	BitmapFileHeader bfh;
 	BitmapInfoHeader bih;
-	short int magicNumber = 0;
-	int padSize = 0;
-	int dataSize = 0;
+	int32_t magicNumber = 0;
+	int32_t padSize = 0;
+	int32_t dataSize = 0;
 	uint8_t* data = NULL;
 	uint8_t* tmpdata = NULL;
 	//<fp = fopen(name, "rb");
@@ -106,7 +106,7 @@ Image* BMPImageLoader::LoadFile(const char* relativePath)
 	fileStream->ReadDataBlock(&bfh, sizeof(BitmapFileHeader));
 	fileStream->ReadDataBlock(&bih, sizeof(BitmapInfoHeader));
 
-	int bpp = (bih.biBitCount/8);
+	int32_t bpp = (bih.biBitCount/8);
 
 	if (bpp != 3 && bpp != 4)
 	{
@@ -130,13 +130,13 @@ Image* BMPImageLoader::LoadFile(const char* relativePath)
 	{
 		tmpdata = new uint8_t[bih.biWidth*3];
 
-		for (int i=0; i<bih.biHeight ; i++)
+		for (int32_t i=0; i<bih.biHeight ; i++)
 		{
 			fileStream->ReadDataBlock(tmpdata, bih.biWidth*3);
 
-			int offset = bih.biWidth * 4 * i;
+			int32_t offset = bih.biWidth * 4 * i;
 
-			for (int j=0; j<bih.biWidth; j++)
+			for (int32_t j=0; j<bih.biWidth; j++)
 			{
 				data[offset++] = tmpdata[j*3+2];
 				data[offset++] = tmpdata[j*3+1];
@@ -154,9 +154,9 @@ Image* BMPImageLoader::LoadFile(const char* relativePath)
 	}
 	else
 	{
-		for (int i=0; i<bih.biHeight ; i++)
+		for (int32_t i=0; i<bih.biHeight ; i++)
 		{
-			int offset = bih.biWidth * 4 * i;
+			int32_t offset = bih.biWidth * 4 * i;
 
 			fileStream->ReadDataBlock(&data[offset], bih.biWidth*4);
 
@@ -181,9 +181,9 @@ void BMPImageLoader::SaveFile(const Image* image, const char* relativePath)
 	{
 		BitmapFileHeader bfh;
 		BitmapInfoHeader bih;
-		int padSize = 0;
-		int imgDataSize = 0;
-		int bmpDataSize;
+		int32_t padSize = 0;
+		int32_t imgDataSize = 0;
+		int32_t bmpDataSize;
 		const uint8_t* imgData = NULL;
 		uint8_t* bmpRow = NULL;
 
@@ -222,18 +222,18 @@ void BMPImageLoader::SaveFile(const Image* image, const char* relativePath)
 		fwrite(&bih, sizeof(bih), 1, fp);
 
 
-		int bpp = image->GetBytesPerPixel();
+		int32_t bpp = image->GetBytesPerPixel();
 
 		imgData = image->GetBuffer();
 		imgDataSize = image->GetWidth() * image->GetHeight() * bpp;
 
 		bmpRow = new uint8_t[bih.biWidth*3];
 
-		for (int i=0; i<bih.biHeight ; i++)
+		for (int32_t i=0; i<bih.biHeight ; i++)
 		{
-			int offset = bih.biWidth * bpp * i;
+			int32_t offset = bih.biWidth * bpp * i;
 
-			for (int j=0; j<bih.biWidth; j++)
+			for (int32_t j=0; j<bih.biWidth; j++)
 			{
 				if (bpp == 2)
 				{
@@ -265,7 +265,7 @@ void BMPImageLoader::SaveFile(const Image* image, const char* relativePath)
 
 		delete[] bmpRow;
 	}
-	catch (int err)
+	catch (int32_t err)
 	{
 		switch (err)
 		{

src/loaders/TGAImageLoader.cpp

@@ -92,7 +92,7 @@ Image* TGAImageLoader::LoadUncompressedData(Stream* fp)
 	if (mTGAHeader.pixel_depth == 16)
 	{
 		data = new uint8_t[(uint32_t)(size * 3)];
-		int j = 0;
+		int32_t j = 0;
 
 		for (uint64_t i = 0; i < size * channels; i++)
 		{

src/loaders/TGAImageLoader.h

@@ -40,16 +40,16 @@ class TGAImageLoader : public ImageLoader
 	struct TGAHeader_t
 	{
 
-		uint8_t id_length;        /* 00h  Size of Image ID field */
-		uint8_t color_map_type;   /* 01h  Color map type */
-		uint8_t image_type;       /* 02h  Image type code */
-		uint8_t c_map_spec[5];    /* 03h  Color map origin 05h Color map length 07h Depth of color map entries */
+		char id_length;        /* 00h  Size of Image ID field */
+		char color_map_type;   /* 01h  Color map type */
+		char image_type;       /* 02h  Image type code */
+		char c_map_spec[5];    /* 03h  Color map origin 05h Color map length 07h Depth of color map entries */
 		uint16_t x_offset;        /* 08h  X origin of image */
 		uint16_t y_offset;        /* 0Ah  Y origin of image */
 		uint16_t width;           /* 0Ch  Width of image */
 		uint16_t height;          /* 0Eh  Height of image */
-		uint8_t pixel_depth;      /* 10h  Image pixel size */
-		uint8_t image_descriptor; /* 11h  Image descriptor byte */
+		char pixel_depth;      /* 10h  Image pixel size */
+		char image_descriptor; /* 11h  Image descriptor byte */
 	};
 
 public:

src/loaders/XWMLReader.cpp

@@ -61,7 +61,7 @@ bool XWMLReader::ParseAction(const Str& actionStr, Str& actionName, List<Str>* a
 	Str actionStatement = actionStr.GetSubstring(8, actionStr.GetLength() - 1);
 
 	arguments->Clear();
-	int openParenthesisIndex = actionStatement.FindFirst('(');
+	int32_t openParenthesisIndex = actionStatement.FindFirst('(');
 	if (openParenthesisIndex != -1)
 	{
 		if (actionStatement[actionStatement.GetLength() - 1] != ')')
@@ -74,13 +74,13 @@ bool XWMLReader::ParseAction(const Str& actionStr, Str& actionName, List<Str>* a
 		//TODO: Use something more appropriate than a split to detect commas
 		actionStatement.Split(',', args);
 		
-		for(int i=0; i<args.GetSize(); i++)
+		for(int32_t i=0; i<args.GetSize(); i++)
 		{
-			int firstQuoteIndex = args[i].FindFirst('\'');
+			int32_t firstQuoteIndex = args[i].FindFirst('\'');
 
 			if (firstQuoteIndex != -1)
 			{
-				int lastQuoteIndex = args[i].FindLast('\'');
+				int32_t lastQuoteIndex = args[i].FindLast('\'');
 				//In this case, trimming is not necessary because apices wrap the item well
 				arguments->Append(args[i].GetSubstring(firstQuoteIndex + 1, lastQuoteIndex));
 			}
@@ -112,7 +112,7 @@ bool XWMLReader::ParseBind(const Str& bindStr, Str& bindPath, Str& source, Str&
 	values.Split(',', splits);
 	
 	bindPath = splits[0];
-	for(int i = 1; i < splits.GetSize(); i++)
+	for(int32_t i = 1; i < splits.GetSize(); i++)
 	{
 		List<Str> valueSplits;
 		splits[i].Split('=', valueSplits);
@@ -154,10 +154,10 @@ Window* XWMLReader::LoadFile(Str filePath, WindowsManager* windowsManager, Windo
 	//Initialize the context
 	if (context != NULL)
 	{
-		context->SetAssociatedWindow(window.GetPointer());
+		context->SetAssociatedWindow(window.GetPoint32_ter());
 	}
 
-	if (!LoadWidgetPropertiesAndChildren(rootNode, window.GetPointer()))
+	if (!LoadWidgetPropertiesAndChildren(rootNode, window.GetPoint32_ter()))
 		return NULL;
 
 	//window->ApplyBinds();
@@ -167,7 +167,7 @@ Window* XWMLReader::LoadFile(Str filePath, WindowsManager* windowsManager, Windo
 		context->OnLoad();
 	}
 
-	return window.GetPointer(true);
+	return window.GetPoint32_ter(true);
 }
 
 Window* XWMLReader::LoadWindow(XMLNode* node, WindowsManager* windowsManager)
@@ -193,10 +193,10 @@ Widget* XWMLReader::LoadWidget(XMLNode* node, Widget* parent)
 		return NULL;
 	}
 
-	if (!LoadWidgetPropertiesAndChildren(node, widget.GetPointer()))
+	if (!LoadWidgetPropertiesAndChildren(node, widget.GetPoint32_ter()))
 		return NULL;
 
-	return widget.GetPointer(true);
+	return widget.GetPoint32_ter(true);
 }
 
 bool XWMLReader::LoadWidgetPropertiesAndChildren(XMLNode* node, Widget* widget)
@@ -264,7 +264,7 @@ bool XWMLReader::LoadWidgetPropertiesAndChildren(XMLNode* node, Widget* widget)
 		widget->SetPropertyValue(ec.current().key, ec.current().value);
 	}
 
-	for(int i=0; i<node->children.GetSize(); i++)
+	for(int32_t i=0; i<node->children.GetSize(); i++)
 		LoadWidget(node->children[i], widget->GetContentWidget());
 
 	return true;

src/network/Message.cpp

@@ -18,13 +18,13 @@ Message::~Message()
   
 }
 
-uchar* Message::get_byte_space(int len)
+uint8_t* Message::get_byte_space(int32_t len)
 {
-	byte *ptr;
+	uint8_t *ptr;
 
 	if (!w_data) 
 	{
-		os::printf( "idBitMsg::GetByteSpace: cannot write to message" );
+		printf( "idBitMsg::GetByteSpace: cannot write to message" );
 	}
 
 	// round up to the next byte
@@ -40,7 +40,7 @@ uchar* Message::get_byte_space(int len)
 	return ptr;  
 }
 
-bool Message::check_overflow(int num_bits)
+bool Message::check_overflow(int32_t num_bits)
 {
 	assert( num_bits >= 0 );
 	
@@ -48,9 +48,9 @@ bool Message::check_overflow(int num_bits)
 	{
 		if (num_bits > (max_size << 3)) 
 		{
-			os::printf(" %i bits is > full message size", num_bits );
+			printf(" %i bits is > full message size", num_bits );
 		}
-		os::printf("overflow\n");
+		printf("overflow\n");
 		begin_writing();
 		overflowed = true;
 		return true;
@@ -58,31 +58,31 @@ bool Message::check_overflow(int num_bits)
 	return false;  
 }
 
-void Message::init(uchar *data, int len)
+void Message::init(uint8_t *data, int32_t len)
 {
 	w_data = data;
 	r_data = data;
 	max_size = len;
 }
 
-void Message::init(const uchar *data, int len)
+void Message::init(const uint8_t *data, int32_t len)
 {
 	w_data = NULL;
 	r_data = data;
 	max_size = len;
 }
 
-uchar* Message::get_data()
+uint8_t* Message::get_data()
 {
 	return w_data;
 }
 
-const uchar* Message::get_data() const
+const uint8_t* Message::get_data() const
 {
 	return r_data;
 }
 
-int Message::get_max_size() const
+int32_t Message::get_max_size() const
 {
 	return max_size;
 }
@@ -93,12 +93,12 @@ bool Message::is_overflowed()
 }
 
 
-int Message::get_size() const
+int32_t Message::get_size() const
 {
 	return cur_size;
 }
 
-void Message::set_size(int size)
+void Message::set_size(int32_t size)
 {
 	if (size > max_size)
 	{
@@ -110,12 +110,12 @@ void Message::set_size(int size)
 	}
 }
 
-int Message::get_write_bit() const
+int32_t Message::get_write_bit() const
 {
 	return write_bit;
 }
 
-void Message::set_write_bit(int bit)
+void Message::set_write_bit(int32_t bit)
 {
 	write_bit = bit & 7;
 	if (write_bit) 
@@ -124,23 +124,23 @@ void Message::set_write_bit(int bit)
 	}
 }
 
-int Message::get_num_bits_written() const
+int32_t Message::get_num_bits_written() const
 {
 	return ((cur_size << 3) - ((8 - write_bit) & 7));  
 }
   
-int Message::get_remaining_write_bits() const
+int32_t Message::get_remaining_write_bits() const
 {
 	return (max_size << 3) - get_num_bits_written(); 
 }
 
-void Message::save_write_state(int& s,int& b) const
+void Message::save_write_state(int32_t& s,int32_t& b) const
 {
 	s = cur_size;
 	b = write_bit;
 }
 
-void Message::restore_write_state(int s,int b)
+void Message::restore_write_state(int32_t s,int32_t b)
 {
 	cur_size = s;
 	write_bit = b & 7;
@@ -151,43 +151,43 @@ void Message::restore_write_state(int s,int b)
 	}  
 }
 
-int Message::get_read_count() const
+int32_t Message::get_read_count() const
 {
 	return read_count;
 }
 
-void Message::set_read_count(int bytes)
+void Message::set_read_count(int32_t bytes)
 {
 	read_count = bytes;
 }
 
-int Message::get_read_bit() const
+int32_t Message::get_read_bit() const
 {
 	return read_bit;
 }
 
-void Message::set_read_bit(int bit)
+void Message::set_read_bit(int32_t bit)
 {
 	read_bit = bit & 7;
 }
 
-int Message::get_num_bits_read() const
+int32_t Message::get_num_bits_read() const
 {
 	return ((read_count << 3) - ((8 - read_bit) & 7));  
 }
 
-int Message::get_remaining_read_bits() const
+int32_t Message::get_remaining_read_bits() const
 {
 	return (cur_size << 3) - get_num_bits_read();
 }
 
-void Message::save_read_state(int& c, int& b) const
+void Message::save_read_state(int32_t& c, int32_t& b) const
 {
 	c = read_count;
 	b = read_bit;
 }
 
-void Message::restore_read_state(int c, int b)
+void Message::restore_read_state(int32_t c, int32_t b)
 {
 	read_count = c;
 	read_bit = b & 7;
@@ -200,7 +200,7 @@ void Message::begin_writing()
 	overflowed = false;
 }
 
-int Message::get_remaining_space() const
+int32_t Message::get_remaining_space() const
 {
 	return max_size - cur_size;
 }
@@ -210,20 +210,20 @@ void Message::write_byte_align()
 	write_bit = 0;
 }
 
-void Message::write_bits(int value, int num_bits)
+void Message::write_bits(int32_t value, int32_t num_bits)
 {
-	int		put;
-	int		fraction;
+	int32_t		put;
+	int32_t		fraction;
 
 	// check if w_data is void
 	if (!w_data) 
 	{
-		os::printf( "cannot write to message" );
+		printf( "cannot write to message" );
 	}
 	// check if the number of bits is valid
 	if (num_bits == 0 || num_bits < -31 || num_bits > 32) 
 	{
-		os::printf( "bad numBits %i", num_bits);
+		printf( "bad numBits %i", num_bits);
 	}
 
 	// check for value overflows
@@ -234,23 +234,23 @@ void Message::write_bits(int value, int num_bits)
 		{
 			if (value > (1 << num_bits) - 1) 
 			{
-				os::printf( "value overflow %d %d", value, num_bits );
+				printf( "value overflow %d %d", value, num_bits );
 			} 
 			else if (value < 0) 
 			{
-				os::printf( "value overflow %d %d", value, num_bits );
+				printf( "value overflow %d %d", value, num_bits );
 			}
 		} 
 		else 
 		{
-			int r = 1 << (-1 - num_bits);
+			int32_t r = 1 << (-1 - num_bits);
 			if (value > r - 1) 
 			{
-				os::printf( "value overflow %d %d", value, num_bits );
+				printf( "value overflow %d %d", value, num_bits );
 			} 
 			else if (value < -r) 
 			{
-				os::printf( "value overflow %d %d", value, num_bits );
+				printf( "value overflow %d %d", value, num_bits );
 			}
 		}
 	}
@@ -290,37 +290,37 @@ void Message::write_bits(int value, int num_bits)
 	}
 }
 
-void Message::write_char(int c)
+void Message::write_int8(int32_t c)
 {
 	write_bits(c, -8);
 }
 
-void Message::write_uchar(int c)
+void Message::write_uint8(int32_t c)
 {
 	write_bits(c, 8);  
 }
 
-void Message::write_short(int c)
+void Message::write_int16(int32_t c)
 {
 	write_bits(c, -16);  
 }
 
-void Message::write_ushort(int c)
+void Message::write_uint16(int32_t c)
 {
 	write_bits(c, 16);
 }
 
-void Message::write_long(int c)
+void Message::write_int64(int32_t c)
 {
 	write_bits(c, 32);
 }
 
 void Message::write_real(real f)
 {
-	write_bits(*reinterpret_cast<int *>(&f), 32);  
+	write_bits(*reinterpret_cast<int32_t *>(&f), 32);  
 }
 
-void Message::write_real(real f, int exp_bits, int mant_bits)
+void Message::write_real(real f, int32_t exp_bits, int32_t mant_bits)
 {
 	//TODO:need to implement floatToBits function
 }
@@ -330,17 +330,17 @@ void Message::write_angle(real f)
 	// needs to be implemented
 }
 
-void Message::write_vec3(const Vec3& v, int num_bits)
+void Message::write_vec3(const Vec3& v, int32_t num_bits)
 {
 	
 }
 
-void Message::write_string(const char* s, int max_len, bool make7Bit)
+void Message::write_string(const char* s, int32_t max_len, bool make7Bit)
 {
   
 }
 
-void Message::write_data(const void* data, int length)
+void Message::write_data(const void* data, int32_t length)
 {
 
 }
@@ -355,7 +355,7 @@ void Message::begin_reading() const
   
 }
 
-int Message::get_remaing_data() const
+int32_t Message::get_remaing_data() const
 {
   
 }
@@ -365,21 +365,21 @@ void Message::read_byte_align() const
   
 }
 
-int Message::read_bits(int num_bits) const
+int32_t Message::read_bits(int32_t num_bits) const
 {
-	int		value;
-	int		value_bits;
-	int		get;
-	int		fraction;
+	int32_t		value;
+	int32_t		value_bits;
+	int32_t		get;
+	int32_t		fraction;
 	bool	sgn;
 
 	if ( !r_data ) {
-		os::printf("cannot read from message");
+		printf("cannot read from message");
 	}
 
 	// check if the number of bits is valid
 	if ( num_bits == 0 || num_bits < -31 || num_bits > 32 ) {
-		os::printf("bad number of bits %i", num_bits );
+		printf("bad number of bits %i", num_bits );
 	}
 
 	value = 0;
@@ -436,25 +436,25 @@ int Message::read_bits(int num_bits) const
 	return value;  
 }
 
-int Message::read_char() const
+int32_t Message::read_int8() const
 {
 }
 
-int Message::read_uchar() const
+int32_t Message::read_uint8() const
 {
 }
 
-int Message::read_short() const
+int32_t Message::read_int16() const
 {
   
 }
 
-int Message::read_ushort() const
+int32_t Message::read_uint16() const
 {
   
 }
 
-int Message::read_long() const
+int32_t Message::read_int64() const
 {
   
 }
@@ -464,7 +464,7 @@ real Message::read_real() const
   
 }
 
-real Message::read_real(int exp_bits, int mant_bits) const
+real Message::read_real(int32_t exp_bits, int32_t mant_bits) const
 {
   
 }
@@ -474,17 +474,17 @@ real Message::read_angle() const
   
 }
 
-Vec3 Message::read_vec3(int num_bits) const
+Vec3 Message::read_vec3(int32_t num_bits) const
 {
   
 }
 
-int Message::read_string(char* buffer, int buffer_size) const
+int32_t Message::read_string(char* buffer, int32_t buffer_size) const
 {
   
 }
 
-int Message::read_data(void* data, int length) const
+int32_t Message::read_data(void* data, int32_t length) const
 {
   
 }
@@ -494,7 +494,7 @@ void Message::read_ipv4addr(os::IPv4Address* addr) const
   
 }
 
-// static int		vec3_to_bits(const Vec3& v, int num_bits);
-// static Vec3		bits_to_vec3(int bits, int num_bits);
+// static int32_t		vec3_to_bits(const Vec3& v, int32_t num_bits);
+// static Vec3		bits_to_vec3(int32_t bits, int32_t num_bits);
+}
 }
-}

src/network/Message.h

@@ -17,85 +17,85 @@ namespace network
 						Message();
 						~Message();
 
-		void			init(uchar *data, int len);
-		void			init(const uchar *data, int len);
-		uchar*			get_data();								// get data for writing
-		const uchar*	get_data() const;						// get data for reading
-		int				get_max_size() const;					// get the maximum message size
+		void			init(uint8_t *data, int32_t len);
+		void			init(const uint8_t *data, int32_t len);
+		uint8_t*		get_data();								// get data for writing
+		const uint8_t*	get_data() const;						// get data for reading
+		int32_t			get_max_size() const;					// get the maximum message size
 		bool 			is_overflowed();						// get overflowed flag
 
 
-		int				get_size() const;						// size of the message in bytes
-		void			set_size(int size);						// set the message size
-		int				get_write_bit() const;					// get current write bit
-		void			set_write_bit(int bit);					// set current write bit
-		int				get_num_bits_written() const;			// returns number of bits written
-		int				get_remaining_write_bits() const;		// space left in bits for writing
-		void			save_write_state(int& s,int& b) const;	// save the write state
-		void			restore_write_state(int s,int b);		// restore the write state
+		int32_t			get_size() const;						// size of the message in bytes
+		void			set_size(int32_t size);						// set the message size
+		int32_t			get_write_bit() const;					// get current write bit
+		void			set_write_bit(int32_t bit);					// set current write bit
+		int32_t			get_num_bits_written() const;			// returns number of bits written
+		int32_t			get_remaining_write_bits() const;		// space left in bits for writing
+		void			save_write_state(int32_t& s,int32_t& b) const;	// save the write state
+		void			restore_write_state(int32_t s,int32_t b);		// restore the write state
 
-		int				get_read_count() const;					// bytes read so far
-		void			set_read_count(int bytes);				// set the number of bytes and bits read
-		int				get_read_bit() const;					// get current read bit
-		void			set_read_bit(int bit);					// set current read bit
-		int				get_num_bits_read() const;				// returns number of bits read
-		int				get_remaining_read_bits() const;		// number of bits left to read
-		void			save_read_state(int& c, int& b) const;	// save the read state
-		void			restore_read_state(int c, int b);		// restore the read state
+		int32_t			get_read_count() const;					// bytes read so far
+		void			set_read_count(int32_t bytes);				// set the number of bytes and bits read
+		int32_t			get_read_bit() const;					// get current read bit
+		void			set_read_bit(int32_t bit);					// set current read bit
+		int32_t			get_num_bits_read() const;				// returns number of bits read
+		int32_t			get_remaining_read_bits() const;		// number of bits left to read
+		void			save_read_state(int32_t& c, int32_t& b) const;	// save the read state
+		void			restore_read_state(int32_t c, int32_t b);		// restore the read state
 
 		void			begin_writing();						// begin writing
-		int				get_remaining_space() const;			// space left in bytes
+		int32_t			get_remaining_space() const;			// space left in bytes
 		void			write_byte_align();						// write up to the next byte boundary
-		void			write_bits(int value, int num_bits);	// write the specified number of bits
-		void			write_char(int c);
-		void			write_uchar(int c);
-		void			write_short(int c);
-		void			write_ushort(int c);
-		void			write_long(int c);
+		void			write_bits(int32_t value, int32_t num_bits);	// write the specified number of bits
+		void			write_int8(int32_t c);
+		void			write_uint8(int32_t c);
+		void			write_int16(int32_t c);
+		void			write_uint16(int32_t c);
+		void			write_int64(int32_t c);
 		void			write_real(real f);
-		void			write_real(real f, int exp_bits, int mant_bits);
+		void			write_real(real f, int32_t exp_bits, int32_t mant_bits);
 		void			write_angle(real f);
-		void			write_vec3(const Vec3& v, int num_bits);
-		void			write_string(const char* s, int max_len = -1, bool make7Bit = true);
-		void			write_data(const void* data, int length);
+		void			write_vec3(const Vec3& v, int32_t num_bits);
+		void			write_string(const char* s, int32_t max_len = -1, bool make7Bit = true);
+		void			write_data(const void* data, int32_t length);
 		void			write_ipv4addr(const os::IPv4Address addr);
 
 		void			begin_reading() const;					// begin reading.
-		int				get_remaing_data() const;				// number of bytes left to read
+		int32_t			get_remaing_data() const;				// number of bytes left to read
 		void			read_byte_align() const;				// read up to the next byte boundary
-		int				read_bits(int num_bits) const;			// read the specified number of bits
-		int				read_char() const;
-		int				read_uchar() const;
-		int				read_short() const;
-		int				read_ushort() const;
-		int				read_long() const;
+		int32_t			read_bits(int32_t num_bits) const;			// read the specified number of bits
+		int32_t			read_int8() const;
+		int32_t			read_uint8() const;
+		int32_t			read_int16() const;
+		int32_t			read_uint16() const;
+		int32_t			read_int64() const;
 		real			read_real() const;
-		real			read_real(int exp_bits, int mant_bits) const;
+		real			read_real(int32_t exp_bits, int32_t mant_bits) const;
 		real			read_angle() const;
-		Vec3			read_vec3(int num_bits) const;
-		int				read_string(char* buffer, int buffer_size) const;
-		int				read_data(void* data, int length) const;
+		Vec3			read_vec3(int32_t num_bits) const;
+		int32_t			read_string(char* buffer, int32_t buffer_size) const;
+		int32_t			read_data(void* data, int32_t length) const;
 		void			read_ipv4addr(os::IPv4Address* addr) const;
 
-// 		static int		vec3_to_bits(const Vec3& v, int num_bits);
-// 		static Vec3		bits_to_vec3(int bits, int num_bits);
+// 		static int32_t		vec3_to_bits(const Vec3& v, int32_t num_bits);
+// 		static Vec3		bits_to_vec3(int32_t bits, int32_t num_bits);
 
 	private:
 	  
-		uchar*			w_data;			// pointer to data for writing
-		const uchar*	r_data;			// pointer to data for reading
-		int				max_size;			// maximum size of message in bytes
-		int				cur_size;			// current size of message in bytes
-		int				write_bit;			// number of bits written to the last written byte
-		mutable int		read_count;			// number of bytes read so far
-		mutable int		read_bit;			// number of bits read from the last read byte
-		bool 			overflowed;			// overflow flag
+		uint8_t*			w_data;			// pointer to data for writing
+		const uint8_t*		r_data;			// point32_ter to data for reading
+		int32_t				max_size;		// maximum size of message in bytes
+		int32_t				cur_size;		// current size of message in bytes
+		int32_t				write_bit;		// number of bits written to the last written byte
+		mutable int32_t		read_count;		// number of bytes read so far
+		mutable int32_t		read_bit;		// number of bits read from the last read byte
+		bool 				overflowed;		// overflow flag
 
 	private:
 	  
-		uchar*			get_byte_space(int len);
-		bool 			check_overflow(int num_bits);			// check buffer overflow	
+		uint8_t*		get_byte_space(int32_t len);
+		bool 			check_overflow(int32_t num_bits);			// check buffer overflow	
   };
+} // namespace network
+} // namespace crown
 
-}
-}

src/os/OS.cpp

@@ -7,11 +7,11 @@ namespace os
 {
 
 static OSEvent		event_queue[MAX_OS_EVENTS];
-static int			event_queue_head = 0;
-static int			event_queue_tail = 0;
+static int32_t			event_queue_head = 0;
+static int32_t			event_queue_tail = 0;
 
 //-----------------------------------------------------------------------------
-void push_event(OSEventType type, int data_a, int data_b, int data_c, int data_d)
+void push_event(OSEventType type, int32_t data_a, int32_t data_b, int32_t data_c, int32_t data_d)
 {
 	if ((event_queue_tail + 1) % MAX_OS_EVENTS == event_queue_head)
 	{

src/os/OS.h

@@ -55,13 +55,13 @@ const size_t	MAX_OS_EVENTS = 512;
 #endif
 
 //-----------------------------------------------------------------------------
-void			printf(const char* string, ...);				//!< Printf wrapper
-void			vprintf(const char* string, va_list arg);		//!< VPrintf wrapper
+void			printf(const char* string, ...);				//!< Print32_tf wrapper
+void			vprintf(const char* string, va_list arg);		//!< VPrint32_tf wrapper
 
-void			log_debug(const char* string, va_list arg);		//!< Print debug message
-void			log_error(const char* string, va_list arg);		//!< Print error message
-void			log_warning(const char* string, va_list arg);	//!< Print warning message
-void			log_info(const char* string, va_list arg);		//!< Print info message
+void			log_debug(const char* string, va_list arg);		//!< Print32_t debug message
+void			log_error(const char* string, va_list arg);		//!< Print32_t error message
+void			log_warning(const char* string, va_list arg);	//!< Print32_t warning message
+void			log_info(const char* string, va_list arg);		//!< Print32_t info message
 
 bool			exists(const char* path);		//!< Returns whether the path is a file or directory on the disk
 
@@ -90,8 +90,8 @@ void			swap_buffers();
 void			event_loop();
 
 void			init_input();
-void			get_cursor_xy(int& x, int& y);
-void			set_cursor_xy(int x, int y);
+void			get_cursor_xy(int32_t& x, int32_t& y);
+void			set_cursor_xy(int32_t x, int32_t y);
 
 void			hide_cursor();
 void			show_cursor();
@@ -113,14 +113,14 @@ enum OSEventType
 struct OSEvent
 {
 	OSEventType		type;
-	int				data_a;
-	int				data_b;
-	int				data_c;
-	int				data_d;
+	int32_t			data_a;
+	int32_t			data_b;
+	int32_t			data_c;
+	int32_t			data_d;
 };
 
-//! Pushes @a event into @a event_queue
-void				push_event(OSEventType type, int data_a, int data_b, int data_c, int data_d);
+//! Pushes @a event int32_to @a event_queue
+void				push_event(OSEventType type, int32_t data_a, int32_t data_b, int32_t data_c, int32_t data_d);
 
 //! Returns the event on top of the @a event_queue	
 OSEvent&			pop_event();
@@ -163,67 +163,67 @@ struct IPv4Address
 
 class UDPSocket
 {
-	public:
-
-					// Constructor
-					UDPSocket();
-					// Destructor
-					~UDPSocket();
-					// Open connection
-		bool 		open(uint16_t port);
-					 // Send data through socket
-		bool 		send(IPv4Address &receiver, const void* data, int size );
-					// Receive data through socket
-		int 		receive(IPv4Address &sender, void* data, int size);
-					// Close connection
-		void 		close();
-					// Is connection open?
-		bool 		is_open();
-
-	private:
-					// Socket descriptor
-		int 		m_socket;  
+public:
+
+				// Constructor
+				UDPSocket();
+				// Destructor
+				~UDPSocket();
+				// Open connection
+	bool 		open(uint16_t port);
+				 // Send data through socket
+	bool 		send(IPv4Address &receiver, const void* data, int32_t size );
+				// Receive data through socket
+	int32_t 	receive(IPv4Address &sender, void* data, int32_t size);
+				// Close connection
+	void 		close();
+				// Is connection open?
+	bool 		is_open();
+
+private:
+				// Socket descriptor
+	int32_t 	m_socket;
 };
 //-----------------------------------------------------------------------------
 
 class TCPSocket
 {
-	public:
+public:
 
 				// Constructor
 				TCPSocket();
 				// Destructor
 				~TCPSocket();
-					// Open connection (server side)
-		bool 		open(uint16_t port);
-					// Connect (client side)
-		bool		connect(IPv4Address& destination);
-					// Close connection
-		int			close();
-					// Send data through socket
-		bool 		send(const void* data, int size);
-					// Receive data through socket
-		int			receive(void* data, int size);
-					// Is connection open?
-		bool 		is_open();
-					// Getter method for socket descriptor
-		int 		get_socket_id();
-					// Getter method for active socket descriptor
-		int 		get_active_socket_id();
-				  // Setter method for socket descriptor
-
-	private:
-
-		void 		set_socket_id(int socket);
-					// Setter method for ative socket descriptor
-		void 		set_active_socket_id(int socket);
-		
-					// Generated by ::socket
-		int 		m_socket;
-				  // Generated by ::accept
-		int 		m_active_socket;
+				// Open connection (server side)
+	bool 		open(uint16_t port);
+				// Connect (client side)
+	bool		connect(IPv4Address& destination);
+				// Close connection
+	int32_t		close();
+				// Send data through socket
+	bool 		send(const void* data, int32_t size);
+				// Receive data through socket
+	int32_t		receive(void* data, int32_t size);
+				// Is connection open?
+	bool 		is_open();
+				// Getter method for socket descriptor
+	int32_t 	get_socket_id();
+				// Getter method for active socket descriptor
+	int32_t 	get_active_socket_id();
+				// Setter method for socket descriptor
+
+private:
+
+	void 		set_socket_id(int32_t socket);
+				// Setter method for ative socket descriptor
+	void 		set_active_socket_id(int32_t socket);
+	
+				// Generated by ::socket
+	int32_t 	m_socket;
+			  	// Generated by ::accept
+	int32_t 	m_active_socket;
 }; 
 
 } // namespace os
-
 } // namespace crown
+

src/os/android/AndroidOS.cpp

@@ -28,15 +28,15 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include <sys/stat.h>
 #include <unistd.h>
 
-#define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, "crown", __VA_ARGS__))
-#define LOGW(...) ((void)__android_log_print(ANDROID_LOG_WARN, "crown", __VA_ARGS__))
-#define LOGD(...) ((void)__android_log_print(ANDROID_LOG_DEBUG, "crown", __VA_ARGS__))
-#define LOGE(...) ((void)__android_log_print(ANDROID_LOG_ERROR, "crown", __VA_ARGS__))
+#define LOGI(...) ((void)__android_log_print32_t(ANDROID_LOG_INFO, "crown", __VA_ARGS__))
+#define LOGW(...) ((void)__android_log_print32_t(ANDROID_LOG_WARN, "crown", __VA_ARGS__))
+#define LOGD(...) ((void)__android_log_print32_t(ANDROID_LOG_DEBUG, "crown", __VA_ARGS__))
+#define LOGE(...) ((void)__android_log_print32_t(ANDROID_LOG_ERROR, "crown", __VA_ARGS__))
 
 namespace crown
 {
 
-void OS::Printf(const char* string, ...)
+void OS::Print32_tf(const char* string, ...)
 {
 	LOGI(string);
 }

src/os/android/AndroidTouch.cpp

@@ -52,8 +52,8 @@ AndroidTouch::~AndroidTouch()
 
 void AndroidTouch::EventLoop()
 {
-	int ident;
-	int events;
+	int32_t ident;
+	int32_t events;
 	struct android_poll_source* source;
 
 	struct android_app* app = mAndroidApp;
@@ -71,7 +71,7 @@ void AndroidTouch::EventLoop()
 					return;
 				}
 
-				int32_t handled = 0;
+				int32_t32_t handled = 0;
 				handled = this->HandleTouchEvent(app, event);
 				AInputQueue_finishEvent(app->inputQueue, event, handled);
 			}
@@ -84,21 +84,21 @@ void AndroidTouch::EventLoop()
 	}
 }
 
-int32_t AndroidTouch::HandleTouchEvent(struct android_app* app, AInputEvent* event)
+int32_t32_t AndroidTouch::HandleTouchEvent(struct android_app* app, AInputEvent* event)
 {
 	TouchEvent touchEvent;
 
 	if (AInputEvent_getType(event) == AINPUT_EVENT_TYPE_MOTION)
 	{
-		int32_t motionAction = AMotionEvent_getAction(event);
-		int32_t motionCode = motionAction & AMOTION_EVENT_ACTION_MASK;
-		int32_t pointerIndex =
+		int32_t32_t motionAction = AMotionEvent_getAction(event);
+		int32_t32_t motionCode = motionAction & AMOTION_EVENT_ACTION_MASK;
+		int32_t32_t point32_terIndex =
 			(motionAction & AMOTION_EVENT_ACTION_POINTER_INDEX_MASK) >> AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT;
-		int32_t pointerCount = AMotionEvent_getPointerCount(event);
+		int32_t32_t point32_terCount = AMotionEvent_getPoint32_terCount(event);
 
-		touchEvent.pointer_id	= AMotionEvent_getPointerId(event, pointerIndex);
-		touchEvent.x			= AMotionEvent_getX(event, pointerIndex);
-		touchEvent.y			= AMotionEvent_getY(event, pointerIndex);
+		touchEvent.point32_ter_id	= AMotionEvent_getPoint32_terId(event, point32_terIndex);
+		touchEvent.x			= AMotionEvent_getX(event, point32_terIndex);
+		touchEvent.y			= AMotionEvent_getY(event, point32_terIndex);
 
 		switch (motionCode)
 		{
@@ -130,9 +130,9 @@ int32_t AndroidTouch::HandleTouchEvent(struct android_app* app, AInputEvent* eve
 			}
 			case AMOTION_EVENT_ACTION_MOVE:
 			{
-				for (int32_t i = 0; i < pointerCount; i++)
+				for (int32_t32_t i = 0; i < point32_terCount; i++)
 				{
-					touchEvent.pointer_id	= AMotionEvent_getPointerId(event, i);
+					touchEvent.point32_ter_id	= AMotionEvent_getPoint32_terId(event, i);
 					touchEvent.x			= AMotionEvent_getX(event, i);
 					touchEvent.y			= AMotionEvent_getY(event, i);
 

src/os/android/AndroidTouch.h

@@ -47,7 +47,7 @@ public:
 
 public:
 
-	int32_t HandleTouchEvent(struct android_app* app, AInputEvent* event);
+	int32_t32_t HandleTouchEvent(struct android_app* app, AInputEvent* event);
 
 	// Android related
 	struct android_app* mAndroidApp;

src/os/linux/EGLRenderWindow.cpp

@@ -111,10 +111,10 @@ bool EGLRenderWindow::Create(uint32_t x, uint32_t y, uint32_t width, uint32_t he
 	xattr.override_redirect = False;
 	XChangeWindowAttributes (mXDisplay, mXWindow, CWOverrideRedirect, &xattr);
 
-	XWMHints hints;
-	hints.input = True;
-	hints.flags = InputHint;
-	XSetWMHints(mXDisplay, mXWindow, &hints);
+	XWMHint32_ts hint32_ts;
+	hint32_ts.input = True;
+	hint32_ts.flags = InputHint32_t;
+	XSetWMHint32_ts(mXDisplay, mXWindow, &hint32_ts);
 
 	XMapRaised(mXDisplay, mXWindow);
 	XStoreName (mXDisplay, mXWindow, "GL test" );
@@ -281,13 +281,13 @@ void EGLRenderWindow::_NotifyMetricsChange(uint32_t x, uint32_t y, uint32_t widt
 	XWindowAttributes attribs;
 	XGetWindowAttributes(mXDisplay, mXWindow, &attribs);
 
-	if (attribs.x == (int)x && attribs.y == (int)y)
+	if (attribs.x == (int32_t)x && attribs.y == (int32_t)y)
 	{
 		mX = x;
 		mY = y;
 	}
 
-	if (attribs.width == (int)width && attribs.height == (int)height)
+	if (attribs.width == (int32_t)width && attribs.height == (int32_t)height)
 	{
 		mWidth = width;
 		mHeight = height;

src/os/linux/GLXRenderWindow.cpp

@@ -58,7 +58,7 @@ bool create_render_window(uint32_t x, uint32_t y, uint32_t width, uint32_t heigh
 	Window defRoot = DefaultRootWindow(display);
 
 	// Color index buffer not supported - deprecated
-	int fbAttribs[] =
+	int32_t fbAttribs[] =
 	{
 		GLX_DOUBLEBUFFER,		True,			// Only double-buffered
 		GLX_RED_SIZE,			8,
@@ -79,7 +79,7 @@ bool create_render_window(uint32_t x, uint32_t y, uint32_t width, uint32_t heigh
 		None
 	};
 
-	int fbCount;
+	int32_t fbCount;
 	GLXFBConfig* fbConfig = glXChooseFBConfig(display, XDefaultScreen(display), fbAttribs, &fbCount);
 
 	if (!fbConfig)

src/os/linux/Input.cpp

@@ -58,7 +58,7 @@ static void x11_create_hidden_cursor()
 }
 
 //-----------------------------------------------------------------------------
-static Key x11_translate_key(int x11_key)
+static Key x11_translate_key(int32_t x11_key)
 {
 	if ((x11_key > 0x40 && x11_key < 0x5B) || (x11_key > 0x60 && x11_key < 0x7B) || (x11_key > 0x2F && x11_key < 0x3A))
 	{
@@ -128,10 +128,10 @@ void init_input()
 }
 
 //-----------------------------------------------------------------------------
-void get_cursor_xy(int& x, int& y)
+void get_cursor_xy(int32_t& x, int32_t& y)
 {
 	Window unused;
-	int pointer_x, pointer_y, dummy;
+	int32_t pointer_x, pointer_y, dummy;
 	uint32_t dummy2;
 
 	XQueryPointer(display, window, &unused, &unused, &dummy, &dummy, &pointer_x, &pointer_y, &dummy2);
@@ -141,7 +141,7 @@ void get_cursor_xy(int& x, int& y)
 }
 
 //-----------------------------------------------------------------------------
-void set_cursor_xy(int x, int y)
+void set_cursor_xy(int32_t x, int32_t y)
 {
 	uint32_t width;
 	uint32_t height;
@@ -215,7 +215,7 @@ void event_loop()
 			case KeyRelease:
 			{
 				char string[4] = {0, 0, 0, 0};
-				int len = -1;
+				int32_t len = -1;
 				KeySym key;
 
 				len = XLookupString(&event.xkey, string, 4, &key, NULL);

src/os/linux/LinuxTCPSocket.cpp

@@ -26,7 +26,7 @@ TCPSocket::~TCPSocket()
 
 bool TCPSocket::open(uint16_t port)
 {
-	int sd = socket(AF_INET, SOCK_STREAM, 0);
+	int32_t sd = socket(AF_INET, SOCK_STREAM, 0);
 
 	if (sd <= 0)
 	{
@@ -56,7 +56,7 @@ bool TCPSocket::open(uint16_t port)
 	sockaddr_in client;
 	uint32_t client_length = sizeof(client);
 
-	int asd = accept(sd, (sockaddr*)&client, &client_length);
+	int32_t asd = accept(sd, (sockaddr*)&client, &client_length);
 	if (asd < 0)
 	{
 		os::printf("failed to accept connection\n");
@@ -69,7 +69,7 @@ bool TCPSocket::open(uint16_t port)
 
 bool TCPSocket::connect(IPv4Address& destination)
 {
-	int sd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+	int32_t sd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
 
 	if (sd <= 0)
 	{
@@ -93,15 +93,15 @@ bool TCPSocket::connect(IPv4Address& destination)
 	}  
 }
 
-int	TCPSocket::close()
+int32_t	TCPSocket::close()
 {
-	int asd = get_active_socket_id();
+	int32_t asd = get_active_socket_id();
 	if (asd != 0)
 	{
 		::close(asd);
 		set_active_socket_id(0);  
 	}
-	int sd = get_socket_id();
+	int32_t sd = get_socket_id();
 	if (sd != 0)
 	{
 		::close(sd);
@@ -109,12 +109,12 @@ int	TCPSocket::close()
 	}
 }
 
-bool TCPSocket::send(const void* data, int size)
+bool TCPSocket::send(const void* data, int32_t size)
 {
 	assert(data);
 	assert(size > 0);
 
-	int sd = get_active_socket_id();
+	int32_t sd = get_active_socket_id();
 	if (sd <= 0)
 	{
 		set_socket_id(0);
@@ -122,7 +122,7 @@ bool TCPSocket::send(const void* data, int size)
 		return false;
 	}
 
-	int sent_bytes = ::send(sd, (const char*)data, size, 0);
+	int32_t sent_bytes = ::send(sd, (const char*)data, size, 0);
 	if (sent_bytes <= 0)
 	{
 		os::printf("Unable to send data");
@@ -132,19 +132,19 @@ bool TCPSocket::send(const void* data, int size)
 	return true;  
 }
 
-int TCPSocket::receive(void* data, int size)
+int32_t TCPSocket::receive(void* data, int32_t size)
 {
 	assert(data);
 	assert(size > 0);
 
-	int sd = get_active_socket_id();
+	int32_t sd = get_active_socket_id();
 
 	if ( sd <= 0 )
 	{
 		return false;
 	}
 
-	int received_bytes = ::recv(sd, (char*)data, size, 0);
+	int32_t received_bytes = ::recv(sd, (char*)data, size, 0);
 	if ( received_bytes <= 0 )
 	{
 		return 0;
@@ -158,22 +158,22 @@ bool TCPSocket::is_open()
 	return m_active_socket != 0 || m_socket != 0;
 }
 
-int	TCPSocket::get_socket_id()
+int32_t	TCPSocket::get_socket_id()
 {
 	return m_socket;
 }
 
-int	TCPSocket::get_active_socket_id()
+int32_t	TCPSocket::get_active_socket_id()
 {
 	return m_active_socket;
 }
 
-void TCPSocket::set_socket_id(int socket)
+void TCPSocket::set_socket_id(int32_t socket)
 {
 	m_socket = socket;
 }
 
-void TCPSocket::set_active_socket_id(int socket)
+void TCPSocket::set_active_socket_id(int32_t socket)
 {
 	m_active_socket = socket;
 }

src/os/linux/LinuxUDPSocket.cpp

@@ -47,7 +47,7 @@ bool UDPSocket::open(uint16_t port)
 			return false;
 		}
 
-		int non_blocking = 1;
+		int32_t non_blocking = 1;
 		if (fcntl( m_socket, F_SETFL, O_NONBLOCK, non_blocking ) == -1)
 		{
 			os::printf("Failed to set non-blocking socket\n");
@@ -58,7 +58,7 @@ bool UDPSocket::open(uint16_t port)
 		return true;
 }
 
-bool UDPSocket::send(IPv4Address &receiver, const void* data, int size)
+bool UDPSocket::send(IPv4Address &receiver, const void* data, int32_t size)
 {
 	assert(data);
 	assert(size > 0);
@@ -76,12 +76,12 @@ bool UDPSocket::send(IPv4Address &receiver, const void* data, int size)
 	address.sin_addr.s_addr = htonl(receiver.get_address());
 	address.sin_port = htons(receiver.get_port());
 
-	int sent_bytes = sendto(m_socket, (const char*)data, size, 0, (sockaddr*)&address, sizeof(sockaddr_in));
+	int32_t sent_bytes = sendto(m_socket, (const char*)data, size, 0, (sockaddr*)&address, sizeof(sockaddr_in));
 
 	return sent_bytes == size;
 }
 
-int UDPSocket::receive(IPv4Address &sender, void* data, int size)
+int32_t UDPSocket::receive(IPv4Address &sender, void* data, int32_t size)
 {
 	assert(data);
 	assert(size > 0);
@@ -94,7 +94,7 @@ int UDPSocket::receive(IPv4Address &sender, void* data, int size)
 	sockaddr_in from;
 	socklen_t from_length = sizeof(from);
 
-	int received_bytes = recvfrom(m_socket, (char*)data, size, 0, (sockaddr*)&from, &from_length);
+	int32_t received_bytes = recvfrom(m_socket, (char*)data, size, 0, (sockaddr*)&from, &from_length);
 
 	if (received_bytes <= 0)
 	{

src/os/win/WGLRenderWindow.cpp

@@ -118,19 +118,19 @@ bool WGLRenderWindow::Create(uint32_t x, uint32_t y, uint32_t width, uint32_t he
 		return false;
 	}
 
-	//Save the WGLRenderWindow pointer to the window's user data
+	//Save the WGLRenderWindow point32_ter to the window's user data
 	SetWindowLong(mWindowHandle, GWL_USERDATA, (LONG) this);
 	RECT rc;
 	rc.left = rc.top = 0;
 	rc.right = width;
 	rc.bottom = height;
-	int style, styleEx;
+	int32_t style, styleEx;
 	style = GetWindowLong(mWindowHandle, GWL_STYLE);
 	styleEx = GetWindowLong(mWindowHandle, GWL_EXSTYLE);
 	AdjustWindowRectEx(&rc, style, false, styleEx);
 	SetWindowPos(mWindowHandle, 0, 0, 0, rc.right-rc.left, rc.bottom-rc.top, SWP_NOMOVE | SWP_NOZORDER);
 	PIXELFORMATDESCRIPTOR pfd;
-	int iFormat;
+	int32_t iFormat;
 	/* get the device context (DC) */
 	mDC = GetDC(mWindowHandle);
 	/* set the pixel format for the DC */
@@ -221,7 +221,7 @@ void WGLRenderWindow::_SetTitleAndAdditionalTextToWindow()
 
 void WGLRenderWindow::EventLoop()
 {
-	//The ultimate lamer trick: do the event loop filtering out the mouse and keyboard events by doing sequential calls with intervals
+	//The ultimate lamer trick: do the event loop filtering out the mouse and keyboard events by doing sequential calls with int32_tervals
 	EventLoopDo(0, 0);
 	//EventLoopDo(1, WM_KEYFIRST-1);
 	//EventLoopDo(WM_KEYFIRST, WM_KEYLAST);
@@ -230,7 +230,7 @@ void WGLRenderWindow::EventLoop()
 	//EventLoopDo(WM_MOUSELAST+1, WM_USER);
 }
 
-void WGLRenderWindow::EventLoopDo(unsigned int minMsg, unsigned int maxMsg)
+void WGLRenderWindow::EventLoopDo(unsigned int32_t minMsg, unsigned int32_t maxMsg)
 {
 	MSG msg;
 	while (PeekMessage(&msg, mWindowHandle, minMsg, maxMsg, PM_REMOVE))