Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed AI_C_THREADSAFE flag - there are unknown compiler errors in the x64 build.

Browse Source 
Removed config options for LWO, code cleanup; still WIP
Added a few StandardShapes implementations.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@126 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
aramis_acg
2008-09-10 14:39:35 +00:00
parent d4d9d016d1
commit 96f2b0b536
12 changed files with 137 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
code/LWOFileData.h
View File

@@ -325,31 +325,6 @@ struct WeightChannel : public VMapEntry
};
// ---------------------------------------------------------------------------
/** \brief LWO2 gradient keyframe
*/
struct GradientKey
{
aiColor4D color;
float value;
};
// ---------------------------------------------------------------------------
/** \brief Data structure for a LWO2 gradient
*/
struct GradientInfo
{
GradientInfo()
: mStart(0.0f)
, mEnd(1.0f)
{}
float mStart,mEnd;
bool mRepeat;
std::vector<GradientKey> mKeys;
};
// ---------------------------------------------------------------------------
/** \brief Data structure for a LWO file texture
*/
@@ -357,12 +332,16 @@ struct Texture
{
Texture()
: mStrength (1.0f)
, iUVChannelIndex (0)
, mUVChannelIndex ("unknown")
, mClipIdx(0xffffffff)
{}
//! File name of the texture
std::string mFileName;
//! Clip index
unsigned int mClipIdx;
//! Strength of the texture
float mStrength;
@@ -370,13 +349,18 @@ struct Texture
/*************** SPECIFIC TO LWO2 *********************/
uint32_t type; // type of the texture
//! Index of the corresponding UV channel
unsigned int iUVChannelIndex;
GradientInfo mGradient;
// todo ... maybe support for procedurals?
//! Name of the corresponding UV channel
std::string mUVChannelIndex;
};
// ---------------------------------------------------------------------------
/** \brief Data structure for a LWO file clip
*/
struct Clip
{
//! path to the base texture
std::string path;
};
// ---------------------------------------------------------------------------
/** \brief Data structure for a LWO file surface (= material)
@@ -432,6 +416,7 @@ typedef std::vector < unsigned int > TagMappingTable;
typedef std::vector < WeightChannel > WeightChannelList;
typedef std::vector < VColorChannel > VColorChannelList;
typedef std::vector < UVChannel > UVChannelList;
typedef std::vector < Clip > ClipList;
// ---------------------------------------------------------------------------