mirror of
https://github.com/mangosfour/server.git
synced 2025-12-16 04:37:00 +00:00
[7912] Remove unexpected indent from file tail.
Note: not code changes, and then binary not updated.
This commit is contained in:
VladimirMangos
parent
42f8ce5f3e
commit
81267151ad
2 changed files with 400 additions and 400 deletions
|
|
@ -1,4 +1,4 @@
|
||||||
#ifndef __REVISION_NR_H__
|
#ifndef __REVISION_NR_H__
|
||||||
#define __REVISION_NR_H__
|
#define __REVISION_NR_H__
|
||||||
#define REVISION_NR "7911"
|
#define REVISION_NR "7912"
|
||||||
#endif // __REVISION_NR_H__
|
#endif // __REVISION_NR_H__
|
||||||
|
|
|
||||||
|
|
@ -171,423 +171,423 @@ namespace VMAP
|
||||||
{
|
{
|
||||||
for(int y=28; y<29 && result; ++y)
|
for(int y=28; y<29 && result; ++y)
|
||||||
{
|
{
|
||||||
#else
|
#else
|
||||||
// ignore DeeprunTram (369) it is too large for short vector and not important
|
// ignore DeeprunTram (369) it is too large for short vector and not important
|
||||||
// ignore test (13), Test (29) , development (451)
|
// ignore test (13), Test (29) , development (451)
|
||||||
if(mapId != 369 && mapId != 13 && mapId != 29 && mapId != 451)
|
if(mapId != 369 && mapId != 13 && mapId != 29 && mapId != 451)
|
||||||
{
|
{
|
||||||
for(int x=0; x<66 && result; ++x)
|
for(int x=0; x<66 && result; ++x)
|
||||||
{
|
|
||||||
for(int y=0; y<66 && result; ++y)
|
|
||||||
{
|
|
||||||
#endif
|
|
||||||
Array<ModelContainer*> mc;
|
|
||||||
std::string dirname;
|
|
||||||
char buffer[100];
|
|
||||||
if(iCoordModelMapping->isWorldAreaMap(mapId) && x<65 && y<65)
|
|
||||||
{
|
|
||||||
sprintf(buffer, "%03u_%d_%d",mapId,y,x); // Let's flip x and y here
|
|
||||||
dirname = std::string(buffer);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
sprintf(buffer, "%03u",mapId);
|
|
||||||
dirname = std::string(buffer);
|
|
||||||
}
|
|
||||||
result = fillModelContainerArray(dirname, mapId, x, y, mc);
|
|
||||||
emptyArray(mc);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#ifdef _ASSEMBLER_DEBUG
|
|
||||||
if(::g_df) fclose(::g_df);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
//=================================================================
|
|
||||||
|
|
||||||
bool TileAssembler::fillModelContainerArray(const std::string& pDirFileName, unsigned int pMapId, int pXPos, int pYPos, Array<ModelContainer*>& pMC)
|
|
||||||
{
|
{
|
||||||
bool result = true;
|
for(int y=0; y<66 && result; ++y)
|
||||||
ModelContainer* modelContainer;
|
|
||||||
|
|
||||||
NameCollection nameCollection = iCoordModelMapping->getFilenamesForCoordinate(pMapId, pXPos, pYPos);
|
|
||||||
if(nameCollection.size() > 0)
|
|
||||||
{
|
{
|
||||||
result = false;
|
#endif
|
||||||
char dirfilename[500];
|
Array<ModelContainer*> mc;
|
||||||
sprintf(dirfilename,"%s/%s.vmdir",iDestDir.c_str(),pDirFileName.c_str());
|
std::string dirname;
|
||||||
FILE *dirfile = fopen(dirfilename, "ab");
|
char buffer[100];
|
||||||
if(dirfile)
|
if(iCoordModelMapping->isWorldAreaMap(mapId) && x<65 && y<65)
|
||||||
{
|
{
|
||||||
result = true;
|
sprintf(buffer, "%03u_%d_%d",mapId,y,x); // Let's flip x and y here
|
||||||
char destnamebuffer[500];
|
dirname = std::string(buffer);
|
||||||
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))
|
|
||||||
{
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
|
|
||||||
//=================================================================
|
|
||||||
|
|
||||||
void removeEntriesFromTree(AABSPTree<SubModel *>* pTree)
|
|
||||||
{
|
|
||||||
Array<SubModel *> submodelArray;
|
|
||||||
pTree->getMembers(submodelArray);
|
|
||||||
int no = submodelArray.size();
|
|
||||||
while(no > 0)
|
|
||||||
{
|
|
||||||
--no;
|
|
||||||
delete submodelArray[no];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//=================================================================
|
|
||||||
|
|
||||||
ModelContainer* TileAssembler::processNames(const Array<std::string>& pPositions, const char* pDestFileName)
|
|
||||||
{
|
|
||||||
ModelContainer *modelContainer = 0;
|
|
||||||
|
|
||||||
Vector3 basepos = Vector3(0,0,0);
|
|
||||||
AABSPTree<SubModel *>* mainTree = new AABSPTree<SubModel *>();
|
|
||||||
|
|
||||||
int pos = 0;
|
|
||||||
|
|
||||||
bool result = true;
|
|
||||||
while(result && (pos < pPositions.size()))
|
|
||||||
{
|
|
||||||
std::string modelPosString = pPositions[pos];
|
|
||||||
std::string modelFileName = getModNameFromModPosName(modelPosString);
|
|
||||||
|
|
||||||
if(!fillModelIntoTree(mainTree, basepos, modelPosString, modelFileName))
|
|
||||||
{
|
|
||||||
result = false;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
++pos;
|
|
||||||
}
|
|
||||||
if(result && mainTree->size() > 0)
|
|
||||||
{
|
|
||||||
mainTree->balance();
|
|
||||||
modelContainer = new ModelContainer(mainTree);
|
|
||||||
modelContainer->writeFile(pDestFileName);
|
|
||||||
}
|
|
||||||
removeEntriesFromTree(mainTree);
|
|
||||||
|
|
||||||
delete mainTree;
|
|
||||||
|
|
||||||
return(modelContainer);
|
|
||||||
}
|
|
||||||
|
|
||||||
//=================================================================
|
|
||||||
bool TileAssembler::readRawFile(std::string& pModelFilename, ModelPosition& pModelPosition, AABSPTree<SubModel *> *pMainTree)
|
|
||||||
{
|
|
||||||
bool result = false;
|
|
||||||
|
|
||||||
std::string filename = iSrcDir;
|
|
||||||
if(filename.length() >0)
|
|
||||||
filename.append("/");
|
|
||||||
filename.append(pModelFilename);
|
|
||||||
FILE *rf = fopen(filename.c_str(), "rb");
|
|
||||||
if(!rf)
|
|
||||||
{
|
|
||||||
// depending on the extractor version, the data could be located in the root dir
|
|
||||||
std::string baseModelFilename = pModelFilename.substr((pModelFilename.find_first_of("/")+1),pModelFilename.length());
|
|
||||||
filename = iSrcDir;
|
|
||||||
if(filename.length() >0)
|
|
||||||
filename.append("/");
|
|
||||||
filename.append(baseModelFilename);
|
|
||||||
rf = fopen(filename.c_str(), "rb");
|
|
||||||
}
|
|
||||||
char ident[8];
|
|
||||||
|
|
||||||
int trianglecount =0;
|
|
||||||
|
|
||||||
#ifdef _ASSEMBLER_DEBUG
|
|
||||||
int startgroup = 0; //2;
|
|
||||||
int endgroup = INT_MAX; //2;
|
|
||||||
fprintf(::g_df,"-------------------------------------------------\n");
|
|
||||||
fprintf(::g_df,"%s\n", pModelFilename.c_str());
|
|
||||||
fprintf(::g_df,"-------------------------------------------------\n");
|
|
||||||
#else
|
|
||||||
int startgroup = 0;
|
|
||||||
int endgroup = INT_MAX;
|
|
||||||
#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 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)
|
|
||||||
{
|
|
||||||
// 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
|
else
|
||||||
{
|
{
|
||||||
// wrong version
|
sprintf(buffer, "%03u",mapId);
|
||||||
fclose(rf);
|
dirname = std::string(buffer);
|
||||||
return(false);
|
|
||||||
}
|
}
|
||||||
G3D::uint32 groups;
|
|
||||||
char blockId[5];
|
|
||||||
blockId[4] = 0;
|
|
||||||
int blocksize;
|
|
||||||
|
|
||||||
READ_OR_RETURN(&groups, sizeof(G3D::uint32));
|
result = fillModelContainerArray(dirname, mapId, x, y, mc);
|
||||||
|
emptyArray(mc);
|
||||||
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);
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#ifdef _ASSEMBLER_DEBUG
|
||||||
|
if(::g_df) fclose(::g_df);
|
||||||
|
#endif
|
||||||
|
|
||||||
//=================================================================
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
bool TileAssembler::fillModelIntoTree(AABSPTree<SubModel *> *pMainTree, const Vector3& pBasePos, std::string& pPos, std::string& pModelFilename)
|
//=================================================================
|
||||||
|
|
||||||
|
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)
|
||||||
|
{
|
||||||
|
result = false;
|
||||||
|
char dirfilename[500];
|
||||||
|
sprintf(dirfilename,"%s/%s.vmdir",iDestDir.c_str(),pDirFileName.c_str());
|
||||||
|
FILE *dirfile = fopen(dirfilename, "ab");
|
||||||
|
if(dirfile)
|
||||||
|
{
|
||||||
|
result = true;
|
||||||
|
char destnamebuffer[500];
|
||||||
|
char fullnamedestnamebuffer[500];
|
||||||
|
if(nameCollection.iMainFiles.size() >0)
|
||||||
{
|
{
|
||||||
bool result = false;
|
sprintf(destnamebuffer,"%03u_%i_%i.vmap",pMapId, pYPos, pXPos); // flip it here too
|
||||||
ModelPosition modelPosition;
|
std::string checkDoubleStr = std::string(dirfilename);
|
||||||
getModelPosition(pPos, modelPosition);
|
checkDoubleStr.append("##");
|
||||||
// all should be relative to object base position
|
checkDoubleStr.append(std::string(destnamebuffer));
|
||||||
modelPosition.moveToBasePos(pBasePos);
|
// Check, if same file already is in the same dir file
|
||||||
|
if(!iCoordModelMapping->isAlreadyProcessedSingleFile(checkDoubleStr))
|
||||||
modelPosition.init();
|
|
||||||
|
|
||||||
if(readRawFile(pModelFilename, modelPosition, pMainTree))
|
|
||||||
{
|
{
|
||||||
result = true;
|
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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
|
// process the large singe files
|
||||||
//=================================================================
|
int pos = 0;
|
||||||
void TileAssembler::getModelPosition(std::string& pPosString, ModelPosition& pModelPosition)
|
while(result && (pos < nameCollection.iSingeFiles.size()))
|
||||||
{
|
{
|
||||||
float vposarray[3];
|
std::string destFileName = iDestDir;
|
||||||
float vdirarray[3];
|
destFileName.append("/");
|
||||||
float scale;
|
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);
|
||||||
|
|
||||||
size_t spos = pPosString.find_first_of('#');
|
Array<std::string> positionarray;
|
||||||
std::string stripedPosString = pPosString.substr(spos+1,pPosString.length());
|
positionarray.append(nameCollection.iSingeFiles[pos]);
|
||||||
|
|
||||||
sscanf(stripedPosString.c_str(), "%f,%f,%f_%f,%f,%f_%f",
|
|
||||||
&vposarray[0],&vposarray[1],&vposarray[2],
|
|
||||||
&vdirarray[0],&vdirarray[1],&vdirarray[2],
|
|
||||||
&scale);
|
|
||||||
|
|
||||||
pModelPosition.iPos = Vector3(vposarray[0], vposarray[1], vposarray[2]);
|
|
||||||
pModelPosition.iDir = Vector3(vdirarray[0], vdirarray[1], vdirarray[2]);
|
|
||||||
pModelPosition.iScale = scale;
|
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
} // VMAP
|
//=================================================================
|
||||||
|
|
||||||
|
void removeEntriesFromTree(AABSPTree<SubModel *>* pTree)
|
||||||
|
{
|
||||||
|
Array<SubModel *> submodelArray;
|
||||||
|
pTree->getMembers(submodelArray);
|
||||||
|
int no = submodelArray.size();
|
||||||
|
while(no > 0)
|
||||||
|
{
|
||||||
|
--no;
|
||||||
|
delete submodelArray[no];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//=================================================================
|
||||||
|
|
||||||
|
ModelContainer* TileAssembler::processNames(const Array<std::string>& pPositions, const char* pDestFileName)
|
||||||
|
{
|
||||||
|
ModelContainer *modelContainer = 0;
|
||||||
|
|
||||||
|
Vector3 basepos = Vector3(0,0,0);
|
||||||
|
AABSPTree<SubModel *>* mainTree = new AABSPTree<SubModel *>();
|
||||||
|
|
||||||
|
int pos = 0;
|
||||||
|
|
||||||
|
bool result = true;
|
||||||
|
while(result && (pos < pPositions.size()))
|
||||||
|
{
|
||||||
|
std::string modelPosString = pPositions[pos];
|
||||||
|
std::string modelFileName = getModNameFromModPosName(modelPosString);
|
||||||
|
|
||||||
|
if(!fillModelIntoTree(mainTree, basepos, modelPosString, modelFileName))
|
||||||
|
{
|
||||||
|
result = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
++pos;
|
||||||
|
}
|
||||||
|
if(result && mainTree->size() > 0)
|
||||||
|
{
|
||||||
|
mainTree->balance();
|
||||||
|
modelContainer = new ModelContainer(mainTree);
|
||||||
|
modelContainer->writeFile(pDestFileName);
|
||||||
|
}
|
||||||
|
removeEntriesFromTree(mainTree);
|
||||||
|
|
||||||
|
delete mainTree;
|
||||||
|
|
||||||
|
return(modelContainer);
|
||||||
|
}
|
||||||
|
|
||||||
|
//=================================================================
|
||||||
|
bool TileAssembler::readRawFile(std::string& pModelFilename, ModelPosition& pModelPosition, AABSPTree<SubModel *> *pMainTree)
|
||||||
|
{
|
||||||
|
bool result = false;
|
||||||
|
|
||||||
|
std::string filename = iSrcDir;
|
||||||
|
if(filename.length() >0)
|
||||||
|
filename.append("/");
|
||||||
|
filename.append(pModelFilename);
|
||||||
|
FILE *rf = fopen(filename.c_str(), "rb");
|
||||||
|
if(!rf)
|
||||||
|
{
|
||||||
|
// depending on the extractor version, the data could be located in the root dir
|
||||||
|
std::string baseModelFilename = pModelFilename.substr((pModelFilename.find_first_of("/")+1),pModelFilename.length());
|
||||||
|
filename = iSrcDir;
|
||||||
|
if(filename.length() >0)
|
||||||
|
filename.append("/");
|
||||||
|
filename.append(baseModelFilename);
|
||||||
|
rf = fopen(filename.c_str(), "rb");
|
||||||
|
}
|
||||||
|
char ident[8];
|
||||||
|
|
||||||
|
int trianglecount =0;
|
||||||
|
|
||||||
|
#ifdef _ASSEMBLER_DEBUG
|
||||||
|
int startgroup = 0; //2;
|
||||||
|
int endgroup = INT_MAX; //2;
|
||||||
|
fprintf(::g_df,"-------------------------------------------------\n");
|
||||||
|
fprintf(::g_df,"%s\n", pModelFilename.c_str());
|
||||||
|
fprintf(::g_df,"-------------------------------------------------\n");
|
||||||
|
#else
|
||||||
|
int startgroup = 0;
|
||||||
|
int endgroup = INT_MAX;
|
||||||
|
#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 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)
|
||||||
|
{
|
||||||
|
// 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);
|
||||||
|
}
|
||||||
|
|
||||||
|
//=================================================================
|
||||||
|
|
||||||
|
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
|
||||||
|
modelPosition.moveToBasePos(pBasePos);
|
||||||
|
|
||||||
|
modelPosition.init();
|
||||||
|
|
||||||
|
if(readRawFile(pModelFilename, modelPosition, pMainTree))
|
||||||
|
{
|
||||||
|
result = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
//=================================================================
|
||||||
|
void TileAssembler::getModelPosition(std::string& pPosString, ModelPosition& pModelPosition)
|
||||||
|
{
|
||||||
|
float vposarray[3];
|
||||||
|
float vdirarray[3];
|
||||||
|
float scale;
|
||||||
|
|
||||||
|
size_t spos = pPosString.find_first_of('#');
|
||||||
|
std::string stripedPosString = pPosString.substr(spos+1,pPosString.length());
|
||||||
|
|
||||||
|
sscanf(stripedPosString.c_str(), "%f,%f,%f_%f,%f,%f_%f",
|
||||||
|
&vposarray[0],&vposarray[1],&vposarray[2],
|
||||||
|
&vdirarray[0],&vdirarray[1],&vdirarray[2],
|
||||||
|
&scale);
|
||||||
|
|
||||||
|
pModelPosition.iPos = Vector3(vposarray[0], vposarray[1], vposarray[2]);
|
||||||
|
pModelPosition.iDir = Vector3(vdirarray[0], vdirarray[1], vdirarray[2]);
|
||||||
|
pModelPosition.iScale = scale;
|
||||||
|
|
||||||
|
}
|
||||||
|
//==========================================
|
||||||
|
} // VMAP
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue