zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Daveo 2001-01-08 21:33:31 +00:00
parent 4561175ce9
commit f3ea84c1ac
5 changed files with 58 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Utils/Libs/GinLib/gintex.cpp
View file

@ -602,7 +602,7 @@ CNode *ParentNode=&SceneTree[ParentIdx];
int tid = Materials->GetTexId(Mat4Id[i].MatId); int tid = Materials->GetTexId(Mat4Id[i].MatId);
if (tid >= Strs.size() || tid < 0) 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; tid=0;
} }
// else // else
@ -738,7 +738,7 @@ int PropCount=UserPropChunk.size();
/*****************************************************************************/ /*****************************************************************************/
void CScene::PrintTreeNode(int Idx,const int Tree) void CScene::PrintTreeNode(int Idx,const int Tree)
{ {
/* //#ifdef _CONSOLE
CNode &Node=SceneTree[Idx]; CNode &Node=SceneTree[Idx];
int NodeIdx,NodeParentIdx; int NodeIdx,NodeParentIdx;
std::vector<int> ChildList; std::vector<int> ChildList;
@ -763,7 +763,7 @@ int ChildCount=ChildList.size();
for (int Child=0;Child<ChildCount;Child++) PrintTreeNode(ChildList[Child],Tree); for (int Child=0;Child<ChildCount;Child++) PrintTreeNode(ChildList[Child],Tree);
PrintTreeSpace--; PrintTreeSpace--;
*/ //#endif
} }
/*****************************************************************************/ /*****************************************************************************/

27
Utils/Libs/GinLib/gintex.h
View file

@ -269,7 +269,13 @@ BOOL operator==(sUV const &v1)
{ {
return(u==v1.u && v==v1.v); return(u==v1.u && v==v1.v);
} }
/*
void operator=(sUV &Src)
{
u=Src.u;
v=Src.v;
}
*/
}; };
struct sUVTri struct sUVTri
@ -283,6 +289,17 @@ BOOL operator==(sUVTri const &v1)
} }
return (TRUE); 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 class CUVtri: public GinChunk
@ -686,15 +703,19 @@ public:
void PrintSceneTree(int Idx=0) 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; PrintTreeSpace=0;
PrintTreeNode(Idx,0); PrintTreeNode(Idx,0);
#endif
} }
void PrintPruneTree(int Idx=0) 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; PrintTreeSpace=0;
PrintTreeNode(Idx,1); PrintTreeNode(Idx,1);
#endif
} }
void PrintTreeNode(int Idx,const int); void PrintTreeNode(int Idx,const int);

4
Utils/Libs/TexGrab/TexGrab.dsp
View file

@ -23,8 +23,8 @@ CFG=TexGrab - Win32 Debug
# Begin Project # Begin Project
# PROP AllowPerConfigDependencies 0 # PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName "" # PROP Scc_ProjName ""$/Utils/Libs/TexGrab", WTCAAAAA"
# PROP Scc_LocalPath "" # PROP Scc_LocalPath "."
CPP=cl.exe CPP=cl.exe
RSC=rc.exe RSC=rc.exe

2
Utils/Libs/TexGrab/sprset.h
View file

@ -189,7 +189,7 @@ class FileInfo
{return(m_allocateAs16Bit);} {return(m_allocateAs16Bit);}
bool getHasMemFrame(void) const bool getHasMemFrame(void) const
{return(MemFrame.SeeData!=0);} {return(MemFrame.SeeData()!=NULL);}
Frame const &getMemFrame() const Frame const &getMemFrame() const
{return(MemFrame);} {return(MemFrame);}

36
tools/Data/include/dstructs.h
View file

@ -53,6 +53,7 @@ struct sShortXYZ
struct sVtx struct sVtx
{ {
s16 vx, vy, vz, pad; s16 vx, vy, vz, pad;
#ifdef WIN32 #ifdef WIN32
bool operator==(sVtx const &v1) {return((vx==v1.vx) && (vy==v1.vy) && (vz==v1.vz));} bool operator==(sVtx const &v1) {return((vx==v1.vx) && (vy==v1.vy) && (vz==v1.vz));}
#endif #endif
@ -109,26 +110,24 @@ struct sQuad
}; // 20 }; // 20
//*************************************************************************** //***************************************************************************
/*
struct sWeight struct sWeight
{ {
s16 X,Y,Z,VtxNo; s16 vx,vy,vz,VtxNo; // 8
}; };
*/
//*************************************************************************** //***************************************************************************
/*
struct sBone struct sBone
{ {
SVECTOR BoneSize; // 8 sVtx BoneSize; // 8
s16 Parent,Idx; s16 Parent,Idx; // 4
s32 WeightCount; // 4 s32 WeightCount; // 4
sWeight *WeightList; sWeight *WeightList; // 4
}; // 16 }; // 20
*/
//*************************************************************************** //***************************************************************************
//*************************************************************************** //***************************************************************************
//*************************************************************************** //***************************************************************************
// Tiles // Maps
enum TILE3D_FLAGS enum TILE3D_FLAGS
{ {
@ -212,6 +211,23 @@ struct sLvlHdr
}; };
//***************************************************************************
//***************************************************************************
//***************************************************************************
// Actors
struct sActor3dHdr
{
u16 NodeCount;
u16 TriCount;
u16 QuadCount;
u16 WeightCount;
u32 NodeData;
u32 TriData;
u32 QuadData;
u32 WeightData;
};
#endif #endif