Changeset 2748 for GTP/trunk

Timestamp:

06/10/08 11:05:51 (17 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/CHC_revisited/occquery.cpp (modified) (5 diffs)

GTP/trunk/App/Demos/Vis/CHC_revisited/occquery.cpp

@@ -353 +353 @@
         char msg8[100];
 
-        sprintf(msg2, "Traversed: %4d, frustum culled: %4d, query culled: %4d (of %d nodes)",
+        sprintf_s(msg2, "Traversed: %4d, frustum culled: %4d, query culled: %4d (of %d nodes)",
                         traverser.GetNumTraversedNodes(), traverser.GetNumFrustumCulledNodes(),
                         traverser.GetNumQueryCulledNodes(), 
@@ -361 +361 @@
         char *querystr[2] = {"NV", "ARB"};
 
-        float fps = 1000.0;
+        float fps = 1e3f;
         long renderTime = calcRenderTime();
-        if(renderTime) fps = 1000000.0f / (float)calcRenderTime();
-
-        sprintf(msg3, "Threshold: %4d, algorithm rendering time: %ld ms (%3.3f fps), queries: %s%s", 
+        if (renderTime) fps = 1e6f / (float)calcRenderTime();
+
+        sprintf_s(msg3, "Threshold: %4d, algorithm rendering time: %ld ms (%3.3f fps), queries: %s%s", 
                 traverser.GetVisibilityThreshold(), renderTime / 1000, fps, querystr[useArbQueries], optstr[useOptimization]);
 
@@ -374 +374 @@
         calcDecimalPoint(str2, Geometry::CountTriangles(objectType) * numObjects);
 
-        sprintf(msg4, "Rendered objects %d (of %d), rendered triangles: %s (of %s)", 
+        sprintf_s(msg4, "Rendered objects %d (of %d), rendered triangles: %s (of %s)", 
                         traverser.GetNumRenderedGeometry(), numObjects, str.c_str(), str2.c_str()); 
 
-        sprintf(msg5, "Next object num: %d", numNextObjects);
-        sprintf(msg6, "Next length in z dir: %3.3f", zLength);
+        sprintf_s(msg5, "Next object num: %d", numNextObjects);
+        sprintf_s(msg6, "Next length in z dir: %3.3f", zLength);
         
         char *objectTypeStr[3] = {"teapot", "torus", "sphere"};
 
-        sprintf(msg7, "Next object type: %s", objectTypeStr[nextObjectType]);
-        sprintf(msg8, "Next object size: %3.3f", objectSize);
+        sprintf_s(msg7, "Next object type: %s", objectTypeStr[nextObjectType]);
+        sprintf_s(msg8, "Next object size: %3.3f", objectSize);
 
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -836 +836 @@
         if (numbers.size() > 0)
         {
-                sprintf(hstr, "%d", numbers.back());
+                sprintf_s(hstr, "%d", numbers.back());
                 str.append(hstr);
         }
@@ -842 +842 @@
         for (size_t i = numbers.size() - 2; i >= 0; i--)
         {
-                sprintf(hstr, ",%03d", numbers[i]);
+                sprintf_s(hstr, ",%03d", numbers[i]);
                 str.append(hstr);
         }