Bugfixes

Author: sadko4u

src/main/fmt/obj/Compressor.cpp

@@ -683,7 +683,7 @@ namespace lsp
             if ((res == STATUS_OK) && (has_normals))
             {
                 if (equal_normals)
-                    res                     = write_varint_icount(n); // Write the fill index
+                    res                     = write_varint_icount(vn[0]); // Write the fill index
                 else
                     res                     = write_indices(vn, n);
             }

src/main/fmt/obj/Decompressor.cpp

@@ -490,12 +490,14 @@ namespace lsp
                 return STATUS_NO_MEM;
 
             index_t *vv             = data.array();
+            index_t *vt             = &vv[count];
+            index_t *vn             = &vt[count];
+
             if ((res = read_indices(vv, count, true)) != STATUS_OK)
                 return res;
-            if ((res = read_indices(&vv[count], count, texcoords)) != STATUS_OK)
+            if ((res = read_indices(vt, count, texcoords)) != STATUS_OK)
                 return res;
 
-            index_t *vn     = &vv[count << 1];
             if (fill)
             {
                 size_t index    = 0;
@@ -511,7 +513,7 @@ namespace lsp
             }
 
 
-            return handler->add_face(vv, &vv[count], vn, count);
+            return handler->add_face(vv, vn, vt, count);
         }
 
         status_t Decompressor::parse_line(IObjHandler *handler, bool texcoords)
@@ -526,12 +528,13 @@ namespace lsp
                 return STATUS_NO_MEM;
 
             index_t *vv             = data.array();
+            index_t *vt             = &vv[count];
             if ((res = read_indices(vv, count, true)) != STATUS_OK)
                 return res;
-            if ((res = read_indices(&vv[count], count, texcoords)) != STATUS_OK)
+            if ((res = read_indices(vt, count, texcoords)) != STATUS_OK)
                 return res;
 
-            return handler->add_line(vv, &vv[count], count);
+            return handler->add_line(vv, vt, count);
         }
 
         status_t Decompressor::parse_points(IObjHandler *handler)

src/test/utest/fmt/obj/compressor.cpp

@@ -217,6 +217,13 @@ namespace lsp
                     memcpy(call->indices.t, vt, n * sizeof(obj::index_t));
                     memcpy(call->indices.n, vn, n * sizeof(obj::index_t));
 
+                    printf("#%04d: f ", int(vCalls.size() - 1));
+                    for (size_t i=0; i<n; ++i)
+                    {
+                        printf("%d/%d/%d ", int(vv[i]), int(vt[i]), int(vn[i]));
+                    }
+                    printf("\n");
+
                     return STATUS_OK;
                 }
 
@@ -370,7 +377,7 @@ UTEST_BEGIN("runtime.fmt.obj", compressor)
                             int(i), int(ca->indices.count), int(cb->indices.count));
                         return i;
                     }
-                    for (size_t j=0; i<ca->indices.count; ++i)
+                    for (size_t j=0; j<ca->indices.count; ++j)
                     {
                         if (ca->indices.v[j] != cb->indices.v[j])
                         {
@@ -379,7 +386,7 @@ UTEST_BEGIN("runtime.fmt.obj", compressor)
                             return i;
                         }
                     }
-                    for (size_t j=0; i<ca->indices.count; ++i)
+                    for (size_t j=0; j<ca->indices.count; ++j)
                     {
                         if (ca->indices.t[j] != cb->indices.t[j])
                         {
@@ -388,7 +395,7 @@ UTEST_BEGIN("runtime.fmt.obj", compressor)
                             return i;
                         }
                     }
-                    for (size_t j=0; i<ca->indices.count; ++i)
+                    for (size_t j=0; j<ca->indices.count; ++j)
                     {
                         if (ca->indices.n[j] != cb->indices.n[j])
                         {
@@ -406,7 +413,7 @@ UTEST_BEGIN("runtime.fmt.obj", compressor)
                             int(i), int(ca->indices.count), int(cb->indices.count));
                         return i;
                     }
-                    for (size_t j=0; i<ca->indices.count; ++i)
+                    for (size_t j=0; j<ca->indices.count; ++j)
                     {
                         if (ca->indices.v[j] != cb->indices.v[j])
                         {
@@ -425,7 +432,7 @@ UTEST_BEGIN("runtime.fmt.obj", compressor)
                         return i;
                     }
 
-                    for (size_t j=0; i<ca->indices.count; ++i)
+                    for (size_t j=0; j<ca->indices.count; ++j)
                     {
                         if (ca->indices.v[j] != cb->indices.v[j])
                         {
@@ -434,7 +441,7 @@ UTEST_BEGIN("runtime.fmt.obj", compressor)
                             return i;
                         }
                     }
-                    for (size_t j=0; i<ca->indices.count; ++i)
+                    for (size_t j=0; j<ca->indices.count; ++j)
                     {
                         if (ca->indices.t[j] != cb->indices.t[j])
                         {
@@ -494,14 +501,12 @@ UTEST_BEGIN("runtime.fmt.obj", compressor)
 
     UTEST_MAIN
     {
-        printf("Testing compression of complicated OBJ file...\n");
+        printf("Testing compression of complicated OBJ files...\n");
         test_compress_obj_file("fmt/obj/parking.obj", "parking");
-        printf("Testing compression of complicated OBJ file...\n");
         test_compress_obj_file("fmt/obj/coliseum.obj", "coliseum");
-        printf("Testing compression of complicated OBJ file...\n");
         test_compress_obj_file("fmt/obj/forest.obj", "forest");
-        printf("Testing compression of complicated OBJ file...\n");
         test_compress_obj_file("fmt/obj/cooling-tower.obj", "cooling-tower");
+        test_compress_obj_file("fmt/obj/church.obj", "church");
     }
 
 UTEST_END