[Hgengine-cvs] SF.net SVN: hgengine:[664] Mercury2/src

[<axl...@us...>]

Revision: 664
          http://hgengine.svn.sourceforge.net/hgengine/?rev=664&view=rev
Author:   axlecrusher
Date:     2010-01-15 21:55:57 +0000 (Fri, 15 Jan 2010)

Log Message:
-----------
fix warnings

Modified Paths:
--------------
    Mercury2/src/BoundingBox.cpp
    Mercury2/src/Camera.cpp
    Mercury2/src/DataStructures/SpatialHash.h
    Mercury2/src/DataTypes/MTriangle.cpp
    Mercury2/src/DataTypes/MTriangle.h
    Mercury2/src/MercuryVBO.h

Modified: Mercury2/src/BoundingBox.cpp
===================================================================
--- Mercury2/src/BoundingBox.cpp	2010-01-15 21:53:59 UTC (rev 663)
+++ Mercury2/src/BoundingBox.cpp	2010-01-15 21:55:57 UTC (rev 664)
@@ -22,7 +22,7 @@
 
 uint32_t OcclusionResult::GetSamples() const
 {
-	if (m_occlusionQuery == 0) return ~0;
+	if (m_occlusionQuery == 0) return ~(uint32_t(0));
 	
 	uint32_t samples;
 	GLCALL( glGetQueryObjectuivARB(m_occlusionQuery, GL_QUERY_RESULT_ARB, &samples) );

Modified: Mercury2/src/Camera.cpp
===================================================================
--- Mercury2/src/Camera.cpp	2010-01-15 21:53:59 UTC (rev 663)
+++ Mercury2/src/Camera.cpp	2010-01-15 21:55:57 UTC (rev 664)
@@ -155,7 +155,7 @@
 {
 	TransformNode::LoadFromXML( node );
 	m_origionalPosition = GetPosition();
-	POST_MESSAGE("QueryTerrainPoint", new VertexDataMessage(GetPosition()), 0.00001);
+	POST_MESSAGE("QueryTerrainPoint", new VertexDataMessage(GetPosition()), 0.00001f);
 }
 
 

Modified: Mercury2/src/DataStructures/SpatialHash.h
===================================================================
--- Mercury2/src/DataStructures/SpatialHash.h	2010-01-15 21:53:59 UTC (rev 663)
+++ Mercury2/src/DataStructures/SpatialHash.h	2010-01-15 21:55:57 UTC (rev 664)
@@ -46,8 +46,13 @@
 			
 			//check for and skip duplicate
 			std::list<T>& cell = m_hashTable[ Index( ix, iy, iz ) ];
+
 			typename std::list<T>::iterator i = cell.begin();
-			for (;i != cell.end(); ++i) if (*i == d) return;
+			for (;i != cell.end(); ++i)
+			{
+				const T& a = *i;
+				if (a == d) return;
+			}
 			
 			cell.push_back( d );
 //			printf("added at %d %d %d\n", ix, iy, iz);
@@ -107,7 +112,7 @@
 		}
 		
 		std::list<T>* m_hashTable;
-		uint32_t m_spacing;
+		float m_spacing;
 		uint32_t m_cellCount;
 };
 

Modified: Mercury2/src/DataTypes/MTriangle.cpp
===================================================================
--- Mercury2/src/DataTypes/MTriangle.cpp	2010-01-15 21:53:59 UTC (rev 663)
+++ Mercury2/src/DataTypes/MTriangle.cpp	2010-01-15 21:55:57 UTC (rev 664)
@@ -73,7 +73,7 @@
 	return r.Length() * 0.5;
 }
 
-bool MTriangle::operator == (const MTriangle& rhs)
+bool MTriangle::operator == (const MTriangle& rhs) const
 {
 	if (m_verts[0] != rhs.m_verts[0]) return false;
 	if (m_verts[1] != rhs.m_verts[1]) return false;

Modified: Mercury2/src/DataTypes/MTriangle.h
===================================================================
--- Mercury2/src/DataTypes/MTriangle.h	2010-01-15 21:53:59 UTC (rev 663)
+++ Mercury2/src/DataTypes/MTriangle.h	2010-01-15 21:55:57 UTC (rev 664)
@@ -15,7 +15,7 @@
 		float Area();
 		MercuryVertex InterpolatePosition(const MercuryVertex& barycentric);
 				
-		bool operator == (const MTriangle& rhs);
+		bool operator == (const MTriangle& rhs) const;
 //	private:
 		
 		MercuryVertex m_verts[3];

Modified: Mercury2/src/MercuryVBO.h
===================================================================
--- Mercury2/src/MercuryVBO.h	2010-01-15 21:53:59 UTC (rev 663)
+++ Mercury2/src/MercuryVBO.h	2010-01-15 21:55:57 UTC (rev 664)
@@ -34,7 +34,7 @@
 		const short unsigned int* GetIndexHandle() const { return m_indexData.Buffer(); }
 		short unsigned int* GetIndexHandle() { return m_indexData.Buffer(); }
 	
-		inline uint16_t IndiceCount() const { return m_indexData.Length(); }
+		inline uint16_t IndiceCount() const { return (uint16_t)m_indexData.Length(); }
 		
 
 		inline void DirtyVertices() { m_bDirtyVertices = true; }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.