xrRender_GL: Fix conformance in For loop scope (#104).

Author: nitrocaster

src/Layers/xrRender/D3DUtils.cpp

@@ -170,7 +170,7 @@ void CDrawUtilities::UpdateGrid(int number_of_cell, float square_size, int subdi
 				m_GridPoints.push_back( right );
 			}
 		}
-		for(i=-m_GridCounts[1]; i<=m_GridCounts[1]; i++){
+		for(int i=-m_GridCounts[1]; i<=m_GridCounts[1]; i++){
 			if( (!!thin) != !!(i%m_GridSubDiv[1]) ){
 				left.p.x = -m_GridCounts[0]*m_GridStep.x;
 				right.p.x = m_GridCounts[0]*m_GridStep.x;
@@ -216,7 +216,7 @@ void CDrawUtilities::OnDeviceCreate()
     // initialize identity box
 	Fbox bb;
 	bb.set(-0.505f,-0.505f,-0.505f, 0.505f,0.505f,0.505f);
-	for (i=0; i<8; i++){
+	for (int i=0; i<8; i++){
     	Fvector S;
     	Fvector p;
         bb.getpoint(i,p);

src/Layers/xrRender/DetailManager_VS.cpp

@@ -84,7 +84,7 @@ void CDetailManager::hw_Load_Geom()
 #else	//	USE_DX10
 		R_CHK			(hw_VB->Lock(0,0,(void**)&pV,0));
 #endif	//	USE_DX10
-		for (o=0; o<objects.size(); o++)
+		for (u32 o=0; o<objects.size(); o++)
 		{
 			const CDetail& D		=	*objects[o];
 			for (u32 batch=0; batch<hw_BatchSize; batch++)
@@ -126,7 +126,7 @@ void CDetailManager::hw_Load_Geom()
 #else	//	USE_DX10
 		R_CHK			(hw_IB->Lock(0,0,(void**)(&pI),0));
 #endif	//	USE_DX10
-		for (o=0; o<objects.size(); o++)
+		for (u32 o=0; o<objects.size(); o++)
 		{
 			const CDetail& D		=	*objects[o];
 			u16		offset	=	0;

src/Layers/xrRender/SkeletonAnimated.cpp

@@ -655,7 +655,7 @@ void CKinematicsAnimated::IBlend_Startup	()
 #endif
 	}
 	// cycles+fx clear
-	for (i=0; i<MAX_PARTS; i++)
+	for (u32 i=0; i<MAX_PARTS; i++)
 		blend_cycles[i].clear();
 	blend_fx.clear		();
 	ChannelFactorsStartup();

src/Layers/xrRender/SkeletonCustom.cpp

@@ -607,7 +607,7 @@ void CKinematics::AddWallmark(const Fmatrix* parent_xform, const Fvector3& start
     test_sphere.set			(cp,size); 
 	U16Vec					test_bones;
 	test_bones.reserve		(LL_BoneCount());
-	for (k=0; k<LL_BoneCount(); k++){
+	for (u16 k=0; k<LL_BoneCount(); k++){
 		CBoneData& BD		= LL_GetData(k);  
 		if (LL_GetBoneVisible(k)&&!BD.shape.flags.is(SBoneShape::sfNoPickable)){
 			Fobb& obb		= cache_obb[k];

src/Layers/xrRender/WallmarksEngine.cpp

@@ -152,7 +152,7 @@ void CWallmarksEngine::RecurseTri(u32 t, Fmatrix &mView, CWallmarksEngine::stati
 		}
 
 		// recurse
-		for (i=0; i<3; i++)
+		for (u32 i=0; i<3; i++)
 		{
 			u32 adj					= sml_adjacency[3*t+i];
 			if (0xffffffff==adj)	continue;

src/Layers/xrRender/dxObjectSpaceRender.cpp

@@ -41,7 +41,7 @@ void dxObjectSpaceRender::dbgRender()
 	}
 	q_debug.boxes.clear();
 
-	for (i=0; i<dbg_S.size(); i++)
+	for (u32 i=0; i<dbg_S.size(); i++)
 	{
 		std::pair<Fsphere,u32>& P = dbg_S[i];
 		Fsphere&	S = P.first;

src/Layers/xrRender/dxStatGraphRender.cpp

@@ -172,7 +172,7 @@ void dxStatGraphRender::RenderBack(CStatGraph &owner)
 		pv->set				(owner.rb.x,int(base_y+g_y*owner.grid_step.y*elem_factor),owner.grid_color); pv++;
 	};
 
-	for (g_y=1; g_y<=Num_H_LinesUp; g_y++)
+	for (int g_y=1; g_y<=Num_H_LinesUp; g_y++)
 	{									
 		pv->set				(owner.lt.x,int(base_y-g_y*owner.grid_step.y*elem_factor),owner.grid_color); pv++; 	
 		pv->set				(owner.rb.x,int(base_y-g_y*owner.grid_step.y*elem_factor),owner.grid_color); pv++; 	

src/Layers/xrRenderPC_GL/gl_loader.cpp

@@ -317,7 +317,7 @@ void CRender::LoadSectors(IReader* fs)
 	{
 		CDB::Collector	CL;
 		fs->find_chunk	(fsL_PORTALS);
-		for (i=0; i<count; i++)
+		for (u32 i=0; i<count; i++)
 		{
 			b_portal	P;
 			fs->r		(&P,sizeof(P));

src/Layers/xrRenderPC_GL/gl_rendertarget.cpp

@@ -766,10 +766,12 @@ CRenderTarget::CRenderTarget		()
 					}
 				}
 			}
-
-			for (int it3=0; it3<TEX_jitter_count-1; it3++)	{
+            int it3 = 0;
+			while (it3<TEX_jitter_count-1)
+            {
 				CHK_GL						(glBindTexture(GL_TEXTURE_2D, t_noise_surf[it3]));
 				CHK_GL						(glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, TEX_jitter, TEX_jitter, GL_RGBA, GL_UNSIGNED_BYTE, tempData[it3]));
+                it3++;
 			}
 
 			float tempDataHBAO[TEX_jitter*TEX_jitter * 4];

src/Layers/xrRenderPC_GL/gl_rendertarget_phase_bloom.cpp

@@ -40,8 +40,8 @@ void	CalcGauss_k7(
 	// calculate
 	float mag					=	0;
 	for (int i=-7; i<=0; i++)	W[-i]	=	expf	(-float(i*i)/(2*r*r));	// weight
-	for (i=0; i<8; i++)	mag		+= i?2*W[i]:W[i];							// symmetrical weight
-	for (i=0; i<8; i++)	W[i]	= s_out*W[i]/mag;
+	for (int i=0; i<8; i++)	mag		+= i?2*W[i]:W[i];							// symmetrical weight
+	for (int i=0; i<8; i++)	W[i]	= s_out*W[i]/mag;
 
 	// W[0]=0, W[7]=-7
 	w0.set	(W[1],W[2],W[3],W[4]);		// -1, -2, -3, -4