This commit is contained in:
parent
4561175ce9
commit
f3ea84c1ac
5 changed files with 58 additions and 21 deletions
|
@ -602,7 +602,7 @@ CNode *ParentNode=&SceneTree[ParentIdx];
|
|||
int tid = Materials->GetTexId(Mat4Id[i].MatId);
|
||||
if (tid >= Strs.size() || tid < 0)
|
||||
{
|
||||
GObject::Error(ERR_WARNING,"Texture index odd (aksed for %d, max is %d) adjusting to 0\n",tid,Strs.size());
|
||||
GObject::Error(ERR_WARNING,"Texture index odd (asked for %d, max is %d) adjusting to 0\n",tid,Strs.size());
|
||||
tid=0;
|
||||
}
|
||||
// else
|
||||
|
@ -738,7 +738,7 @@ int PropCount=UserPropChunk.size();
|
|||
/*****************************************************************************/
|
||||
void CScene::PrintTreeNode(int Idx,const int Tree)
|
||||
{
|
||||
/*
|
||||
//#ifdef _CONSOLE
|
||||
CNode &Node=SceneTree[Idx];
|
||||
int NodeIdx,NodeParentIdx;
|
||||
std::vector<int> ChildList;
|
||||
|
@ -763,7 +763,7 @@ int ChildCount=ChildList.size();
|
|||
|
||||
for (int Child=0;Child<ChildCount;Child++) PrintTreeNode(ChildList[Child],Tree);
|
||||
PrintTreeSpace--;
|
||||
*/
|
||||
//#endif
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -269,7 +269,13 @@ BOOL operator==(sUV const &v1)
|
|||
{
|
||||
return(u==v1.u && v==v1.v);
|
||||
}
|
||||
|
||||
/*
|
||||
void operator=(sUV &Src)
|
||||
{
|
||||
u=Src.u;
|
||||
v=Src.v;
|
||||
}
|
||||
*/
|
||||
};
|
||||
|
||||
struct sUVTri
|
||||
|
@ -283,6 +289,17 @@ BOOL operator==(sUVTri const &v1)
|
|||
}
|
||||
return (TRUE);
|
||||
}
|
||||
/*
|
||||
inline void operator=(sUVTri &Src)
|
||||
{
|
||||
for (int i=0; i<3; i++)
|
||||
{
|
||||
//p[i]=Src.p[i];
|
||||
p[i].u=Src.p[i].u;
|
||||
p[i].v=Src.p[i].v;
|
||||
}
|
||||
}
|
||||
*/
|
||||
};
|
||||
|
||||
class CUVtri: public GinChunk
|
||||
|
@ -686,15 +703,19 @@ public:
|
|||
|
||||
void PrintSceneTree(int Idx=0)
|
||||
{
|
||||
// printf("SceneTree - %i Nodes\n\n",SceneTree.size());
|
||||
#ifdef _CONSOLE
|
||||
printf("SceneTree - %i Nodes\n\n",SceneTree.size());
|
||||
PrintTreeSpace=0;
|
||||
PrintTreeNode(Idx,0);
|
||||
#endif
|
||||
}
|
||||
void PrintPruneTree(int Idx=0)
|
||||
{
|
||||
// printf("PruneTree - %i Nodes\n\n",PruneTree.size());
|
||||
#ifdef _CONSOLE
|
||||
printf("PruneTree - %i Nodes\n\n",PruneTree.size());
|
||||
PrintTreeSpace=0;
|
||||
PrintTreeNode(Idx,1);
|
||||
#endif
|
||||
}
|
||||
void PrintTreeNode(int Idx,const int);
|
||||
|
||||
|
|
|
@ -23,8 +23,8 @@ CFG=TexGrab - Win32 Debug
|
|||
|
||||
# Begin Project
|
||||
# PROP AllowPerConfigDependencies 0
|
||||
# PROP Scc_ProjName ""
|
||||
# PROP Scc_LocalPath ""
|
||||
# PROP Scc_ProjName ""$/Utils/Libs/TexGrab", WTCAAAAA"
|
||||
# PROP Scc_LocalPath "."
|
||||
CPP=cl.exe
|
||||
RSC=rc.exe
|
||||
|
||||
|
|
|
@ -189,7 +189,7 @@ class FileInfo
|
|||
{return(m_allocateAs16Bit);}
|
||||
|
||||
bool getHasMemFrame(void) const
|
||||
{return(MemFrame.SeeData!=0);}
|
||||
{return(MemFrame.SeeData()!=NULL);}
|
||||
|
||||
Frame const &getMemFrame() const
|
||||
{return(MemFrame);}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue