Changeset 2127 for GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/vmi/src/histogram.cpp

Timestamp:

02/19/07 09:16:59 (17 years ago)

Author:

gumbau

Message:

 

File:

• GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/vmi/src/histogram.cpp (modified) (15 diffs)

GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/vmi/src/histogram.cpp

@@ -14 +14 @@
 using namespace VMI;
 
-void VMI::printHistogram(GLuint histoGram[][4]) {
+void VMI::printHistogram(int histoGram[][4]) {
     int i;
    
@@ -23 +23 @@
 }
 
-void VMI::plotHistogram(GLuint histoGram[][4]) {
+void VMI::plotHistogram(int histoGram[][4]) {
     int i;
-    GLuint iLargest = 0;  // Largest histogram value
+    int iLargest = 0;  // Largest histogram value
     GLfloat maxHeight = height / 2.0f;
         
@@ -72 +72 @@
 }
 
-GLuint **VMI::initHistogram(GLuint numTriangles, GLuint numCameras) {
-    GLuint i;
-    GLuint **histogram;
-
-    histogram = (GLuint **)malloc(sizeof(GLuint *) * numCameras);
+int **VMI::initHistogram(int numTriangles, int numCameras) {
+    int i;
+    int **histogram;
+
+    histogram = (int **)malloc(sizeof(int *) * numCameras);
 
     if (histogram == NULL) {
@@ -84 +84 @@
 
     for (i=0; i<numCameras; i++)
-    histogram[i] = (GLuint *)malloc(sizeof(GLuint) * (numTriangles + 1)); // + 1 because the last is the numPixels of the background
+    histogram[i] = (int *)malloc(sizeof(int) * (numTriangles + 1)); // + 1 because the last is the numPixels of the background
 
     // Fill the histogram buffer with 0
     for (i=0; i<numCameras; i++)
-    memset(histogram[i], 0, sizeof(GLuint) * (numTriangles + 1));
+    memset(histogram[i], 0, sizeof(int) * (numTriangles + 1));
 
     return histogram;
 }
 
-void VMI::deleteHistogram(GLuint **histogram, GLuint numCameras) {
-    GLuint i;
+void VMI::deleteHistogram(int **histogram, int numCameras) {
+    int i;
     
     for (i=0;i<numCameras;i++)
@@ -102 +102 @@
 }
 
-void VMI::printFullHistogram(GLuint **histogram, GLuint numCameras, GLuint numTriangles) {
-    GLuint i, j;
+void VMI::printFullHistogram(int **histogram, int numCameras, int numTriangles) {
+    int i, j;
     
     printf("\n");
@@ -116 +116 @@
 }
 
-void VMI::getSubHistogram(GLuint subHistoGram[][4]) {
+void VMI::getSubHistogram(int subHistoGram[][4]) {
     //printf("Computing histogram...\n");
     // Define the histogram
@@ -137 +137 @@
 }
 
-void VMI::copySubHistogram(Color *colors, GLuint *histogram, GLuint begin, GLuint end, GLuint subHistoGram[][4]) {
-    GLuint i;
+void VMI::copySubHistogram(Color *colors, int *histogram, int begin, int end, int subHistoGram[][4]) {
+    int i;
     GLubyte r, g, b, a;
-    GLuint h = 0;
+    int h = 0;
 
     for (i=begin; i<end; i++) {
@@ -165 +165 @@
 }
 
-void VMI::getSWHistogram(GLuint *histogram, GLubyte *pixels) {
+void VMI::getSWHistogram(int *histogram, GLubyte *pixels) {
     GLubyte r, g, b, a;
-    GLuint i, t, p, numPixels = width * height;
+    int i, t, p, numPixels = width * height;
 
     glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
@@ -188 +188 @@
 
 void VMI::getBoundingBox(Change *c, GLfloat min[3], GLfloat max[3]) {
-    GLuint  i, j, t, v;
+    int  i, j, t, v;
     GLfloat maxx = 0.0f, minx = 0.0f, 
             maxy = 0.0f, miny = 0.0f,
@@ -194 +194 @@
     
     /* get the max/mins */
-    for (i=0; i<(GLuint)c->numMod; i++) {
+    for (i=0; i<c->numMod; i++) {
         t = c->modified[i].id;
         
@@ -217 +217 @@
     }
 
-    for (i=0; i<(GLuint)c->numDel; i++) {
+    for (i=0; i<c->numDel; i++) {
         t = c->deleted[i].id;
         
@@ -322 +322 @@
 }
 
-void VMI::getSWHistogramWin(GLuint *histogram, GLubyte *pixels, GLfloat min[3], GLfloat max[3], Change *c) {
+void VMI::getSWHistogramWin(int *histogram, GLubyte *pixels, GLfloat min[3], GLfloat max[3], Change *c) {
     GLubyte r, g, b, a;
-    GLuint i, t, p, numPixels,
-          *histoAux = (GLuint *)calloc(mesh->numTriangles + 1, sizeof(GLuint));
+    int i, t, p, numPixels,
+          *histoAux = (int *)calloc(mesh->numTriangles + 1, sizeof(int));
     GLint minw[2], maxw[2], ox, oy, h, w;
 
@@ -369 +369 @@
     }
 
-    for (i=0; i<(GLuint)c->numMod; i++) {
-        t = (GLuint)c->modified[i].id;
+    for (i=0; i<c->numMod; i++) {
+        t = c->modified[i].id;
 
         histogram[t + 1] = histoAux[t + 1]; 
@@ -379 +379 @@
 }
 
-void VMI::getSWHistoByOcclusionQuery(Mesh *mesh, Color *colors, GLuint *histogram) {
-    GLuint i, v1, v2, v3;
+void VMI::getSWHistoByOcclusionQuery(Mesh *mesh, Color *colors, int *histogram) {
+    int i, v1, v2, v3;
     GLint area, totalArea = 0;
 
@@ -432 +432 @@
 }
 
-void VMI::resetSWHistogram(GLuint *histogram, GLuint numTriangles) {
+void VMI::resetSWHistogram(int *histogram, int numTriangles) {
 
     // Fill the histogram buffer with 0
-    memset(histogram, 0, sizeof(GLuint) * (numTriangles + 1));
-}
+    memset(histogram, 0, sizeof(int) * (numTriangles + 1));
+}