[Csp-commits] svn:csp r1241 - trunk/CSP/CSPChunkLod/src/osgChunkLod

[<sv...@ww...>]

Author: mkrose
Date: 2004-09-24 22:11:06 -0700 (Fri, 24 Sep 2004)
New Revision: 1241

Modified:
   trunk/CSP/CSPChunkLod/src/osgChunkLod/ChunkLodDrawable.cpp
   trunk/CSP/CSPChunkLod/src/osgChunkLod/TextureQuadTree.cpp
Log:
Fix a couple gcc warnings in CSPChunkLod.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1241

Modified: trunk/CSP/CSPChunkLod/src/osgChunkLod/ChunkLodDrawable.cpp
===================================================================
--- trunk/CSP/CSPChunkLod/src/osgChunkLod/ChunkLodDrawable.cpp	2004-09-25 05:09:26 UTC (rev 1240)
+++ trunk/CSP/CSPChunkLod/src/osgChunkLod/ChunkLodDrawable.cpp	2004-09-25 05:11:06 UTC (rev 1241)
@@ -148,14 +148,14 @@
 		osg::Timer_t update_t = t.tick();
 
 		tree->update (viewpoint, state);
-		osg::Timer_t render_t = t.tick();
+		//osg::Timer_t render_t = t.tick();
 		_triangles_rendered = tree->render(state, *_details);
 		_triangle_count += _triangles_rendered;
 
 
 		float dt = t.delta_s(update_t, t.tick());
 		if (dt > 0.0030) {
-			float utime = t.delta_s(update_t, render_t) * 1000.0;
+			//float utime = t.delta_s(update_t, render_t) * 1000.0;
 			dt *= 1000.0;
 			//std::cout << "PAUSE c-lod render " << dt << " ms (" << utime << ", " << (dt - utime) << ")\n";
 		}

Modified: trunk/CSP/CSPChunkLod/src/osgChunkLod/TextureQuadTree.cpp
===================================================================
--- trunk/CSP/CSPChunkLod/src/osgChunkLod/TextureQuadTree.cpp	2004-09-25 05:09:26 UTC (rev 1240)
+++ trunk/CSP/CSPChunkLod/src/osgChunkLod/TextureQuadTree.cpp	2004-09-25 05:11:06 UTC (rev 1241)
@@ -210,7 +210,7 @@
 	jmd.decompress();
 
 	osg::Image* img = new osg::Image();
-	unsigned int pf;
+	unsigned int pf = 0;
 	if (jmd.depth == 1) pf = GL_LUMINANCE;
 	else if (jmd.depth == 2) pf = GL_LUMINANCE_ALPHA;
 	else if (jmd.depth == 3) pf = GL_RGB;