[7913] Fixed vmap_assambler sources. Updated binary.

* Fixed week ago added bugs into vmap code that break vmap_assambler sources work.
  Note: vmap_assambler binary not updated from nov 2008 until this commit and it has been correct working.
* Add to vmap assambler process show output and add appropriate error messages output.
* vmap_assambler binary updated.

contrib/vmap_assembler/vmap_assembler.cpp

@@ -78,41 +78,43 @@ bool readConfigFile(char *pConffile, VMAP::TileAssembler* pTa)
 //=======================================================
 int main(int argc, char* argv[])
 {
-    if(argc == 3 || argc == 4)
+    if(argc != 3 && argc != 4)
-    {
-        bool ok = true;
-        char *src = argv[1];
-        char *dest = argv[2];
-        char *conffile = NULL;
-        if(argc >= 4) {
-            conffile = argv[3];
-        }
-        VMAP::TileAssembler* ta = new VMAP::TileAssembler(std::string(src), std::string(dest));
-        ta->setModelNameFilterMethod(modelNameFilter);
-
-        /*
-        All the names in the list are considered to be world maps or huge instances.
-        These maps will be spilt into tiles in the vmap assemble process
-        */
-        if(conffile != NULL) {
-            ok = readConfigFile(conffile, ta);
-            if(!ok) {
-                printf("Can not open file config file: %s\n", conffile);
-            }
-        }
-        if(ok) { ok = ta->convertWorld(); }
-        if(ok) {
-            printf("Ok, all done\n");
-        } else {
-            printf("exit with errors\n");
-            return 1;
-        }
-        delete ta;
-    }
-    else
     {
         printf("\nusage: %s <raw data dir> <vmap dest dir> [config file name]\n", argv[0]);
         return 1;
     }
+
+    char *src = argv[1];
+    char *dest = argv[2];
+    char *conffile = NULL;
+    if(argc >= 4)
+        conffile = argv[3];
+
+    VMAP::TileAssembler* ta = new VMAP::TileAssembler(std::string(src), std::string(dest));
+    ta->setModelNameFilterMethod(modelNameFilter);
+
+    /*
+    All the names in the list are considered to be world maps or huge instances.
+    These maps will be spilt into tiles in the vmap assemble process
+    */
+    if(conffile != NULL)
+    {
+        if(!readConfigFile(conffile, ta))
+        {
+            printf("Can not open file config file: %s\n", conffile);
+            delete ta;
+            return 1;
+        }
+    }
+
+    if(!ta->convertWorld())
+    {
+        printf("exit with errors\n");
+        delete ta;
+        return 1;
+    }
+
+    delete ta;
+    printf("Ok, all done\n");
     return 0;
 }

src/shared/revision_nr.h

@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "7912"
+ #define REVISION_NR "7913"
 #endif // __REVISION_NR_H__

src/shared/vmap/CoordModelMapping.cpp

@@ -85,63 +85,65 @@ namespace VMAP
     bool CoordModelMapping::readCoordinateMapping(const std::string& pDirectoryFileName)
     {
         FILE *f = fopen(pDirectoryFileName.c_str(), "rb");
-        bool result = false;
+        if(!f)
+        {
+            printf("ERROR: Can't open file: %s\n",pDirectoryFileName.c_str());
+            return false;
+        }
+
         char buffer[500+1];
 
-        if(f)
+        CMappingEntry* cMappingEntry;
+        while(fgets(buffer, 500, f))
         {
-            result = true;
+            //char namebuffer[500];
-            CMappingEntry* cMappingEntry;
+            char positionbuffer[500];
-            while(fgets(buffer, 500, f))
+            int xpos, ypos, noVec;
+            float scale;
+            xpos = ypos = noVec = 0;
+
+            //sscanf(buffer, "%d %d %s %s %f %d", &xpos, &ypos, namebuffer,positionbuffer, &scale, &noVec);
+
+            // this is ugly, but the format has no read delimiter and a space could be in the first part of the name
+            int nameStart = findPosChar(buffer, ' ', 2);// find the 2. space
+            if(nameStart > -1 && (iFilterMethod == NULL || (*iFilterMethod)(buffer)))
             {
-                //char namebuffer[500];
+                ++nameStart;
-                char positionbuffer[500];
+                // find the 1. / (now a space only can be found at the end of the name)
-                int xpos, ypos, noVec;
+                int nameEnd = nameStart + findPosChar(&buffer[nameStart], '/', 1);
-                float scale;
+                // find the 1. space (after the name)
-                xpos = ypos = noVec = 0;
+                nameEnd += findPosChar(&buffer[nameEnd], ' ', 1);
+                buffer[nameEnd] = 0;                    // terminate the name
 
-                //sscanf(buffer, "%d %d %s %s %f %d", &xpos, &ypos, namebuffer,positionbuffer, &scale, &noVec);
+                sscanf(buffer, "%d %d", &xpos, &ypos);
-
+                sscanf(&buffer[nameEnd+1], "%s %f %d", positionbuffer, &scale, &noVec);
-                // this is ugly, but the format has no read delimiter and a space could be in the first part of the name
+                unsigned int mapId = getMapIdFromFilename(std::string(&buffer[nameStart]));
-                int nameStart = findPosChar(buffer, ' ', 2);// find the 2. space
+                if(!iMapIds.contains(mapId))
-                if(nameStart > -1 && (iFilterMethod == NULL || (*iFilterMethod)(buffer)))
                 {
-                    ++nameStart;
+                    iMapIds.append(mapId);
-                                                            // find the 1. / (now a space only can be found at the end of the name)
+                    printf("Coords for map %u...\n",mapId);
-                    int nameEnd = nameStart + findPosChar(&buffer[nameStart], '/', 1);
-                                                            // find the 1. space (after the name)
-                    nameEnd += findPosChar(&buffer[nameEnd], ' ', 1);
-                    buffer[nameEnd] = 0;                    // terminate the name
-
-                    sscanf(buffer, "%d %d", &xpos, &ypos);
-                    sscanf(&buffer[nameEnd+1], "%s %f %d", positionbuffer, &scale, &noVec);
-                    unsigned int mapId = getMapIdFromFilename(std::string(&buffer[nameStart]));
-                    if(!iMapIds.contains(mapId))
-                    {
-                        iMapIds.append(mapId);
-                    }
-                    if(!isWorldAreaMap(mapId))
-                    {
-                        xpos = 0;                           // store all files under the groupKey
-                        ypos = 0;
-                    }
-
-                    std::string key = CMappingEntry::getKeyString(mapId, xpos, ypos);
-                    cMappingEntry = getCMappingEntry(key);
-                    if(cMappingEntry == 0)
-                    {
-                        cMappingEntry = new CMappingEntry(mapId, xpos, ypos);
-                        addCMappingEntry(cMappingEntry);
-                    }
-                    char namebuffer2[500];
-                    sprintf(namebuffer2, "%d %s#%s_%f", noVec, &buffer[nameStart], positionbuffer, scale);
-                    cMappingEntry->addFilename(namebuffer2);
-                    //break;
                 }
+                if(!isWorldAreaMap(mapId))
+                {
+                    xpos = 0;                           // store all files under the groupKey
+                    ypos = 0;
+                }
+
+                std::string key = CMappingEntry::getKeyString(mapId, xpos, ypos);
+                cMappingEntry = getCMappingEntry(key);
+                if(cMappingEntry == 0)
+                {
+                    cMappingEntry = new CMappingEntry(mapId, xpos, ypos);
+                    addCMappingEntry(cMappingEntry);
+                }
+                char namebuffer2[500];
+                sprintf(namebuffer2, "%d %s#%s_%f", noVec, &buffer[nameStart], positionbuffer, scale);
+                cMappingEntry->addFilename(namebuffer2);
+                //break;
             }
-            fclose(f);
         }
-        return result;
+        fclose(f);
+        return true;
     }
 
     //============================================================

src/shared/vmap/TileAssembler.cpp

@@ -148,37 +148,41 @@ namespace VMAP
         #   endif
         #endif
 
-        bool result = true;
         std::string fname = iSrcDir;
         fname.append("/");
         fname.append("dir");
         iCoordModelMapping->setModelNameFilterMethod(iFilterMethod);
-        iCoordModelMapping->readCoordinateMapping(fname);
+
+        printf("Read coordinate mapping...\n");
+        if(!iCoordModelMapping->readCoordinateMapping(fname))
+            return false;
 
         Array<unsigned int> mapIds = iCoordModelMapping->getMaps();
         if(mapIds.size() == 0)
         {
-            result = false;
+            printf("Fatal error: empty map list!\n");
+            return false;
         }
-        for(int i=0; i<mapIds.size() && result; ++i)
+
+        for(int i=0; i<mapIds.size(); ++i)
         {
             unsigned int mapId = mapIds[i];
 
             #ifdef _ASSEMBLER_DEBUG
             if(mapId == 0)                                  // "Azeroth" just for debug
             {
-                for(int x=28; x<29 && result; ++x)          //debug
+                for(int x=28; x<29; ++x)                    //debug
                 {
-                    for(int y=28; y<29 && result; ++y)
+                    for(int y=28; y<29; ++y)
                     {
             #else
             // ignore DeeprunTram (369) it is too large for short vector and not important
             // ignore test (13), Test (29) , development (451)
             if(mapId != 369 && mapId != 13 && mapId != 29 && mapId != 451)
             {
-                for(int x=0; x<66 && result; ++x)
+                for(int x=0; x<66; ++x)
                 {
-                    for(int y=0; y<66 && result; ++y)
+                    for(int y=0; y<66; ++y)
                     {
             #endif
                         Array<ModelContainer*> mc;
@@ -188,15 +192,23 @@ namespace VMAP
                         {
                             sprintf(buffer, "%03u_%d_%d",mapId,y,x); // Let's flip x and y here
                             dirname = std::string(buffer);
+                            printf("%s...\n",dirname.c_str());
                         }
                         else
                         {
                             sprintf(buffer, "%03u",mapId);
                             dirname = std::string(buffer);
+
+                            // prevent spam for small maps
+                            if(x==0 && y==0)
+                                printf("%s...\n",dirname.c_str());
                         }
 
-                        result = fillModelContainerArray(dirname, mapId, x, y, mc);
+                        bool result = fillModelContainerArray(dirname, mapId, x, y, mc);
                         emptyArray(mc);
+
+                        if(!result)
+                            return false;
                     }
                 }
             }
@@ -205,91 +217,85 @@ namespace VMAP
         if(::g_df) fclose(::g_df);
         #endif
 
-        return result;
+        return true;
     }
 
     //=================================================================
 
     bool TileAssembler::fillModelContainerArray(const std::string& pDirFileName, unsigned int pMapId, int pXPos, int pYPos, Array<ModelContainer*>& pMC)
     {
-        bool result = true;
         ModelContainer* modelContainer;
 
         NameCollection nameCollection = iCoordModelMapping->getFilenamesForCoordinate(pMapId, pXPos, pYPos);
-        if(nameCollection.size() > 0)
+        if(nameCollection.size() ==  0)
+            return true;                                    // no data...
+
+        char dirfilename[500];
+        sprintf(dirfilename,"%s/%s.vmdir",iDestDir.c_str(),pDirFileName.c_str());
+        FILE *dirfile = fopen(dirfilename, "ab");
+        if(!dirfile)
         {
-            result = false;
+            printf("ERROR: Can't create file %s",dirfilename);
-            char dirfilename[500];
+            return false;
-            sprintf(dirfilename,"%s/%s.vmdir",iDestDir.c_str(),pDirFileName.c_str());
+        }
-            FILE *dirfile = fopen(dirfilename, "ab");
+
-            if(dirfile)
+        char destnamebuffer[500];
+        char fullnamedestnamebuffer[500];
+        
+        if(nameCollection.iMainFiles.size() >0)
+        {
+            sprintf(destnamebuffer,"%03u_%i_%i.vmap",pMapId, pYPos, pXPos); // flip it here too
+            std::string checkDoubleStr = std::string(dirfilename);
+            checkDoubleStr.append("##");
+            checkDoubleStr.append(std::string(destnamebuffer));
+            // Check, if same file already is in the same dir file
+            if(!iCoordModelMapping->isAlreadyProcessedSingleFile(checkDoubleStr))
             {
-                result = true;
+                iCoordModelMapping->addAlreadyProcessedSingleFile(checkDoubleStr);
-                char destnamebuffer[500];
+                fprintf(dirfile, "%s\n",destnamebuffer);
-                char fullnamedestnamebuffer[500];
+                sprintf(fullnamedestnamebuffer,"%s/%s",iDestDir.c_str(),destnamebuffer);
-                if(nameCollection.iMainFiles.size() >0)
+                modelContainer = processNames(nameCollection.iMainFiles, fullnamedestnamebuffer);
-                {
+                if(modelContainer)
-                    sprintf(destnamebuffer,"%03u_%i_%i.vmap",pMapId, pYPos, pXPos); // flip it here too
+                    pMC.append(modelContainer);
-                    std::string checkDoubleStr = std::string(dirfilename);
+                else
-                    checkDoubleStr.append("##");
+                    printf("warning: (if) problems in processing data for %s\n",destnamebuffer);
-                    checkDoubleStr.append(std::string(destnamebuffer));
-                    // Check, if same file already is in the same dir file
-                    if(!iCoordModelMapping->isAlreadyProcessedSingleFile(checkDoubleStr))
-                    {
-                        iCoordModelMapping->addAlreadyProcessedSingleFile(checkDoubleStr);
-                        fprintf(dirfile, "%s\n",destnamebuffer);
-                        sprintf(fullnamedestnamebuffer,"%s/%s",iDestDir.c_str(),destnamebuffer);
-                        modelContainer = processNames(nameCollection.iMainFiles, fullnamedestnamebuffer);
-                        if(modelContainer)
-                        {
-                            pMC.append(modelContainer);
-                        }
-                        else
-                        {
-                            result = false;
-                        }
-                    }
-                }
-                // process the large singe files
-                int pos = 0;
-                while(result && (pos < nameCollection.iSingeFiles.size()))
-                {
-                    std::string destFileName = iDestDir;
-                    destFileName.append("/");
-                    std::string dirEntryName = getDirEntryNameFromModName(pMapId,nameCollection.iSingeFiles[pos]);
-                    std::string checkDoubleStr = std::string(dirfilename);
-                    checkDoubleStr.append("##");
-                    checkDoubleStr.append(nameCollection.iSingeFiles[pos]);
-                    // Check, if same file already is in the same dir file
-                    if(!iCoordModelMapping->isAlreadyProcessedSingleFile(checkDoubleStr))
-                    {
-                        iCoordModelMapping->addAlreadyProcessedSingleFile(checkDoubleStr);
-                        fprintf(dirfile, "%s\n",dirEntryName.c_str());
-                        destFileName.append(dirEntryName);
-
-                        Array<std::string> positionarray;
-                        positionarray.append(nameCollection.iSingeFiles[pos]);
-
-                        if(!iCoordModelMapping->isAlreadyProcessedSingleFile(nameCollection.iSingeFiles[pos]))
-                        {
-                            modelContainer = processNames(positionarray, destFileName.c_str());
-                            iCoordModelMapping->addAlreadyProcessedSingleFile(nameCollection.iSingeFiles[pos]);
-                            if(modelContainer)
-                            {
-                                pMC.append(modelContainer);
-                            }
-                            else
-                            {
-                                result = false;
-                            }
-                        }
-                    }
-                    ++pos;
-                }
-                fclose(dirfile);
             }
         }
-        return(result);
+        // process the large singe files
+        int pos = 0;
+        while(pos < nameCollection.iSingeFiles.size())
+        {
+            std::string destFileName = iDestDir;
+            destFileName.append("/");
+            std::string dirEntryName = getDirEntryNameFromModName(pMapId,nameCollection.iSingeFiles[pos]);
+            std::string checkDoubleStr = std::string(dirfilename);
+            checkDoubleStr.append("##");
+            checkDoubleStr.append(nameCollection.iSingeFiles[pos]);
+            // Check, if same file already is in the same dir file
+            if(!iCoordModelMapping->isAlreadyProcessedSingleFile(checkDoubleStr))
+            {
+                iCoordModelMapping->addAlreadyProcessedSingleFile(checkDoubleStr);
+                fprintf(dirfile, "%s\n",dirEntryName.c_str());
+                destFileName.append(dirEntryName);
+
+                Array<std::string> positionarray;
+                positionarray.append(nameCollection.iSingeFiles[pos]);
+
+                if(!iCoordModelMapping->isAlreadyProcessedSingleFile(nameCollection.iSingeFiles[pos]))
+                {
+                    modelContainer = processNames(positionarray, destFileName.c_str());
+                    iCoordModelMapping->addAlreadyProcessedSingleFile(nameCollection.iSingeFiles[pos]);
+                    if(modelContainer)
+                        pMC.append(modelContainer);
+                    else
+                        printf("warning: (while) problems in processing data for %s\n",destFileName.c_str());
+                }
+            }
+            ++pos;
+        }
+
+        fclose(dirfile);
+        return true;
     }
 
     //=================================================================
@@ -346,8 +352,6 @@ namespace VMAP
     //=================================================================
     bool TileAssembler::readRawFile(std::string& pModelFilename,  ModelPosition& pModelPosition, AABSPTree<SubModel *> *pMainTree)
     {
-        bool result = false;
-
         std::string filename = iSrcDir;
         if(filename.length() >0)
             filename.append("/");
@@ -363,6 +367,14 @@ namespace VMAP
             filename.append(baseModelFilename);
             rf = fopen(filename.c_str(), "rb");
         }
+
+        if(!rf)
+        {
+            printf("ERROR: Can't open model file in form: %s",pModelFilename.c_str());
+            printf("...                          or form: %s",filename );
+            return false;
+        }
+
         char ident[8];
 
         int trianglecount =0;
@@ -379,181 +391,182 @@ namespace VMAP
         #endif
 
         // temporary use defines to simplify read/check code (close file and return at fail)
-        #define READ_OR_RETURN(V,S) if(fread((V), (S), 1, rf) != 1) { fclose(rf); return(false); }
+        #define READ_OR_RETURN(V,S) if(fread((V), (S), 1, rf) != 1) { \
-        #define CMP_OR_RETURN(V,S)  if(strcmp((V),(S)) != 0)        { fclose(rf); return(false); }
+                                        fclose(rf); return(false); }
+        #define CMP_OR_RETURN(V,S)  if(strcmp((V),(S)) != 0)        { \
+                                        fclose(rf); return(false); }
 
-        if(rf)
+        READ_OR_RETURN(&ident, 8);
+        if(strcmp(ident, "VMAP001") == 0)
         {
-            READ_OR_RETURN(&ident, 8);
+            // OK, do nothing
-            if(strcmp(ident, "VMAP001") == 0)
-            {
-                // OK, do nothing
-            }
-            else if(strcmp(ident, "VMAP002") == 0)
-            {
-                // we have to read one int. This is needed during the export and we have to skip it here
-                int tempNVectors;
-                READ_OR_RETURN(&tempNVectors, sizeof(int));
-
-            }
-            else
-            {
-                // wrong version
-                fclose(rf);
-                return(false);
-            }
-            G3D::uint32 groups;
-            char blockId[5];
-            blockId[4] = 0;
-            int blocksize;
-
-            READ_OR_RETURN(&groups, sizeof(G3D::uint32));
-
-            for(int g=0;g<(int)groups;g++)
-            {
-                // group MUST NOT have more then 65536 indexes !! Array will have a problem with that !! (strange ...)
-                Array<int> tempIndexArray;
-                Array<Vector3> tempVertexArray;
-
-                AABSPTree<Triangle> *gtree = new AABSPTree<Triangle>();
-
-                // add free gtree at fail
-                #undef READ_OR_RETURN
-                #undef CMP_OR_RETURN
-                #define READ_OR_RETURN(V,S) if(fread((V), (S), 1, rf) != 1) { fclose(rf); delete gtree; return(false); }
-                #define CMP_OR_RETURN(V,S)  if(strcmp((V),(S)) != 0)        { fclose(rf); delete gtree; return(false); }
-
-                G3D::uint32 flags;
-                READ_OR_RETURN(&flags, sizeof(G3D::uint32));
-
-                G3D::uint32 branches;
-                READ_OR_RETURN(&blockId, 4);
-                CMP_OR_RETURN(blockId, "GRP ");
-                READ_OR_RETURN(&blocksize, sizeof(int));
-                READ_OR_RETURN(&branches, sizeof(G3D::uint32));
-                for(int b=0;b<(int)branches; b++)
-                {
-                    G3D::uint32 indexes;
-                    // indexes for each branch (not used jet)
-                    READ_OR_RETURN(&indexes, sizeof(G3D::uint32));
-                }
-
-                // ---- indexes
-                READ_OR_RETURN(&blockId, 4);
-                CMP_OR_RETURN(blockId, "INDX");
-                READ_OR_RETURN(&blocksize, sizeof(int));
-                unsigned int nindexes;
-                READ_OR_RETURN(&nindexes, sizeof(G3D::uint32));
-                if(nindexes >0)
-                {
-                    unsigned short *indexarray = new unsigned short[nindexes*sizeof(unsigned short)];
-                    READ_OR_RETURN(indexarray, sizeof(unsigned short));
-                    for(int i=0;i<(int)nindexes; i++)
-                    {
-                        unsigned short val = indexarray[i];
-                        tempIndexArray.append(val);
-                    }
-                    delete[] indexarray;
-                }
-
-                // ---- vectors
-                READ_OR_RETURN(&blockId, 4);
-                CMP_OR_RETURN(blockId, "VERT");
-                READ_OR_RETURN(&blocksize, sizeof(int));
-                unsigned int nvectors;
-                READ_OR_RETURN(&nvectors, sizeof(int));
-
-                float *vectorarray = 0;
-
-                // add vectorarray free
-                #undef READ_OR_RETURN
-                #undef CMP_OR_RETURN
-                #define READ_OR_RETURN(V,S) if(fread((V), (S), 1, rf) != 1) { fclose(rf); delete gtree; delete[] vectorarray; return(false); }
-                #define CMP_OR_RETURN(V,S)  if(strcmp((V),(S)) != 0)        { fclose(rf); delete gtree; delete[] vectorarray; return(false); }
-
-                if(nvectors >0)
-                {
-                    vectorarray = new float[nvectors*sizeof(float)*3];
-                    READ_OR_RETURN(vectorarray, sizeof(float)*3);
-                }
-                // ----- liquit
-                if(flags & 1)
-                {
-                    // we have liquit -> not handled yet ... skip
-                    READ_OR_RETURN(&blockId, 4);
-                    CMP_OR_RETURN(blockId, "LIQU");
-                    READ_OR_RETURN(&blocksize, sizeof(int));
-                    fseek(rf, blocksize, SEEK_CUR);
-                }
-
-
-                for(unsigned int i=0, indexNo=0; indexNo<nvectors; indexNo++)
-                {
-                    Vector3 v = Vector3(vectorarray[i+2], vectorarray[i+1], vectorarray[i+0]);
-                    i+=3;
-                    v = pModelPosition.transform(v);
-
-                    float swapy = v.y;
-                    v.y = v.x;
-                    v.x = swapy;
-
-                    tempVertexArray.append(v);
-                }
-
-                // ---- calculate triangles
-                int rest = nindexes%3;
-                if(rest != 0)
-                {
-                    nindexes -= rest;
-                }
-
-                for(unsigned int i=0;i<(nindexes);)
-                {
-                    Triangle t = Triangle(tempVertexArray[tempIndexArray[i+2]], tempVertexArray[tempIndexArray[i+1]], tempVertexArray[tempIndexArray[i+0]] );
-                    i+=3;
-                    ++trianglecount;
-                    if(g>= startgroup && g <= endgroup)
-                    {
-                        gtree->insert(t);
-                    }
-                }
-
-                // drop of temporary use defines
-                #undef READ_OR_RETURN
-                #undef CMP_OR_RETURN
-
-                if(vectorarray != 0)
-                {
-                    delete vectorarray;
-                }
-
-                if(gtree->size() >0)
-                {
-                    gtree->balance();
-                    SubModel *sm = new SubModel(gtree);
-                    #ifdef _ASSEMBLER_DEBUG
-                    if(::g_df) fprintf(::g_df,"group trianglies: %d, Tris: %d, Nodes: %d, gtree.triangles: %d\n", g, sm->getNTriangles(), sm->getNNodes(), gtree->memberTable.size());
-                    if(sm->getNTriangles() !=  gtree->memberTable.size())
-                    {
-                        if(::g_df) fprintf(::g_df,"ERROR !!!! group trianglies: %d, Tris: %d, Nodes: %d, gtree.triangles: %d\n", g, sm->getNTriangles(), sm->getNNodes(), gtree->memberTable.size());
-                    }
-                    #endif
-                    sm->setBasePosition(pModelPosition.iPos);
-                    pMainTree->insert(sm);
-                }
-                delete gtree;
-            }
-            fclose(rf);
-            result = true;
         }
-        return(result);
+        else if(strcmp(ident, "VMAP002") == 0)
+        {
+            // we have to read one int. This is needed during the export and we have to skip it here
+            int tempNVectors;
+            READ_OR_RETURN(&tempNVectors, sizeof(int));
+
+        }
+        else
+        {
+            // wrong version
+            fclose(rf);
+            return(false);
+        }
+        G3D::uint32 groups;
+        char blockId[5];
+        blockId[4] = 0;
+        int blocksize;
+
+        READ_OR_RETURN(&groups, sizeof(G3D::uint32));
+
+        for(int g=0;g<(int)groups;g++)
+        {
+            // group MUST NOT have more then 65536 indexes !! Array will have a problem with that !! (strange ...)
+            Array<int> tempIndexArray;
+            Array<Vector3> tempVertexArray;
+
+            AABSPTree<Triangle> *gtree = new AABSPTree<Triangle>();
+
+            // add free gtree at fail
+            #undef READ_OR_RETURN
+            #undef CMP_OR_RETURN
+            #define READ_OR_RETURN(V,S) if(fread((V), (S), 1, rf) != 1) { \
+                                            fclose(rf); delete gtree; return(false); }
+            #define CMP_OR_RETURN(V,S)  if(strcmp((V),(S)) != 0)        { \
+                                            fclose(rf); delete gtree; return(false); }
+
+            G3D::uint32 flags;
+            READ_OR_RETURN(&flags, sizeof(G3D::uint32));
+
+            G3D::uint32 branches;
+            READ_OR_RETURN(&blockId, 4);
+            CMP_OR_RETURN(blockId, "GRP ");
+            READ_OR_RETURN(&blocksize, sizeof(int));
+            READ_OR_RETURN(&branches, sizeof(G3D::uint32));
+            for(int b=0;b<(int)branches; b++)
+            {
+                G3D::uint32 indexes;
+                // indexes for each branch (not used jet)
+                READ_OR_RETURN(&indexes, sizeof(G3D::uint32));
+            }
+
+            // ---- indexes
+            READ_OR_RETURN(&blockId, 4);
+            CMP_OR_RETURN(blockId, "INDX");
+            READ_OR_RETURN(&blocksize, sizeof(int));
+            unsigned int nindexes;
+            READ_OR_RETURN(&nindexes, sizeof(G3D::uint32));
+            if(nindexes >0)
+            {
+                unsigned short *indexarray = new unsigned short[nindexes*sizeof(unsigned short)];
+                READ_OR_RETURN(indexarray, nindexes*sizeof(unsigned short));
+                for(int i=0;i<(int)nindexes; i++)
+                {
+                    unsigned short val = indexarray[i];
+                    tempIndexArray.append(val);
+                }
+                delete[] indexarray;
+            }
+
+            // ---- vectors
+            READ_OR_RETURN(&blockId, 4);
+            CMP_OR_RETURN(blockId, "VERT");
+            READ_OR_RETURN(&blocksize, sizeof(int));
+            unsigned int nvectors;
+            READ_OR_RETURN(&nvectors, sizeof(int));
+
+            float *vectorarray = 0;
+
+            // add vectorarray free
+            #undef READ_OR_RETURN
+            #undef CMP_OR_RETURN
+            #define READ_OR_RETURN(V,S) if(fread((V), (S), 1, rf) != 1) { \
+                                            fclose(rf); delete gtree; delete[] vectorarray; return(false); }
+            #define CMP_OR_RETURN(V,S)  if(strcmp((V),(S)) != 0)        { \
+                                            fclose(rf); delete gtree; delete[] vectorarray; return(false); }
+
+            if(nvectors >0)
+            {
+                vectorarray = new float[nvectors*sizeof(float)*3];
+                READ_OR_RETURN(vectorarray, nvectors*sizeof(float)*3);
+            }
+            // ----- liquit
+            if(flags & 1)
+            {
+                // we have liquit -> not handled yet ... skip
+                READ_OR_RETURN(&blockId, 4);
+                CMP_OR_RETURN(blockId, "LIQU");
+                READ_OR_RETURN(&blocksize, sizeof(int));
+                fseek(rf, blocksize, SEEK_CUR);
+            }
+
+
+            for(unsigned int i=0, indexNo=0; indexNo<nvectors; indexNo++)
+            {
+                Vector3 v = Vector3(vectorarray[i+2], vectorarray[i+1], vectorarray[i+0]);
+                i+=3;
+                v = pModelPosition.transform(v);
+
+                float swapy = v.y;
+                v.y = v.x;
+                v.x = swapy;
+
+                tempVertexArray.append(v);
+            }
+
+            // ---- calculate triangles
+            int rest = nindexes%3;
+            if(rest != 0)
+            {
+                nindexes -= rest;
+            }
+
+            for(unsigned int i=0;i<(nindexes);)
+            {
+                Triangle t = Triangle(tempVertexArray[tempIndexArray[i+2]], tempVertexArray[tempIndexArray[i+1]], tempVertexArray[tempIndexArray[i+0]] );
+                i+=3;
+                ++trianglecount;
+                if(g>= startgroup && g <= endgroup)
+                {
+                    gtree->insert(t);
+                }
+            }
+
+            // drop of temporary use defines
+            #undef READ_OR_RETURN
+            #undef CMP_OR_RETURN
+
+            if(vectorarray != 0)
+            {
+                delete vectorarray;
+            }
+
+            if(gtree->size() >0)
+            {
+                gtree->balance();
+                SubModel *sm = new SubModel(gtree);
+                #ifdef _ASSEMBLER_DEBUG
+                if(::g_df) fprintf(::g_df,"group trianglies: %d, Tris: %d, Nodes: %d, gtree.triangles: %d\n", g, sm->getNTriangles(), sm->getNNodes(), gtree->memberTable.size());
+                if(sm->getNTriangles() !=  gtree->memberTable.size())
+                {
+                    if(::g_df) fprintf(::g_df,"ERROR !!!! group trianglies: %d, Tris: %d, Nodes: %d, gtree.triangles: %d\n", g, sm->getNTriangles(), sm->getNNodes(), gtree->memberTable.size());
+                }
+                #endif
+                sm->setBasePosition(pModelPosition.iPos);
+                pMainTree->insert(sm);
+            }
+            delete gtree;
+        }
+        fclose(rf);
+        return true;
     }
 
     //=================================================================
 
     bool TileAssembler::fillModelIntoTree(AABSPTree<SubModel *> *pMainTree, const Vector3& pBasePos, std::string& pPos, std::string& pModelFilename)
     {
-        bool result = false;
         ModelPosition modelPosition;
         getModelPosition(pPos, modelPosition);
         // all should be relative to object base position
@@ -561,12 +574,7 @@ namespace VMAP
 
         modelPosition.init();
 
-        if(readRawFile(pModelFilename,  modelPosition, pMainTree))
+        return readRawFile(pModelFilename,  modelPosition, pMainTree);
-        {
-            result = true;
-        }
-
-        return result;
     }
 
     //=================================================================