Commit 54b918f7 authored by hybrid's avatar hybrid

Removed some unused variables.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1252 dfc29bdd-3216-0410-991c-e03cc46cb475
parent beea38a1
...@@ -927,7 +927,7 @@ void CGUITable::draw() ...@@ -927,7 +927,7 @@ void CGUITable::draw()
const wchar_t* text = Columns[i].Name.c_str(); const wchar_t* text = Columns[i].Name.c_str();
u32 colWidth = Columns[i].Width; u32 colWidth = Columns[i].Width;
core::dimension2d<s32 > dim = font->getDimension(text); //core::dimension2d<s32 > dim = font->getDimension(text);
core::rect<s32> columnrect(pos, tableRect.UpperLeftCorner.Y, pos + colWidth, headerBottom); core::rect<s32> columnrect(pos, tableRect.UpperLeftCorner.Y, pos + colWidth, headerBottom);
...@@ -974,7 +974,7 @@ void CGUITable::draw() ...@@ -974,7 +974,7 @@ void CGUITable::draw()
} }
void CGUITable::breakText(const core::stringw &text, core::stringw & brokenText, u32 cellWidth) void CGUITable::breakText(const core::stringw& text, core::stringw& brokenText, u32 cellWidth)
{ {
IGUISkin* skin = Environment->getSkin(); IGUISkin* skin = Environment->getSkin();
...@@ -1022,12 +1022,14 @@ void CGUITable::breakText(const core::stringw &text, core::stringw & brokenText, ...@@ -1022,12 +1022,14 @@ void CGUITable::breakText(const core::stringw &text, core::stringw & brokenText,
brokenText = line; brokenText = line;
} }
//! Set some flags influencing the layout of the table //! Set some flags influencing the layout of the table
void CGUITable::setDrawFlags(s32 flags) void CGUITable::setDrawFlags(s32 flags)
{ {
DrawFlags = flags; DrawFlags = flags;
} }
//! Get the flags which influence the layout of the table //! Get the flags which influence the layout of the table
s32 CGUITable::getDrawFlags() const s32 CGUITable::getDrawFlags() const
{ {
...@@ -1102,6 +1104,7 @@ void CGUITable::serializeAttributes(io::IAttributes* out, io::SAttributeReadWrit ...@@ -1102,6 +1104,7 @@ void CGUITable::serializeAttributes(io::IAttributes* out, io::SAttributeReadWrit
out->addInt("DrawFlags", DrawFlags); out->addInt("DrawFlags", DrawFlags);
} }
//! Reads attributes of the element //! Reads attributes of the element
void CGUITable::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) void CGUITable::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options)
{ {
......
...@@ -51,7 +51,9 @@ IAnimatedMesh* CXMeshFileLoader::createMesh(io::IReadFile* f) ...@@ -51,7 +51,9 @@ IAnimatedMesh* CXMeshFileLoader::createMesh(io::IReadFile* f)
if (!f) if (!f)
return 0; return 0;
#ifdef _XREADER_DEBUG
u32 time = os::Timer::getRealTime(); u32 time = os::Timer::getRealTime();
#endif
AnimatedMesh = new CSkinnedMesh(); AnimatedMesh = new CSkinnedMesh();
...@@ -503,7 +505,7 @@ bool CXMeshFileLoader::parseDataObjectTemplate() ...@@ -503,7 +505,7 @@ bool CXMeshFileLoader::parseDataObjectTemplate()
} }
// read GUID // read GUID
core::stringc guid = getNextToken(); getNextToken();
// read and ignore data members // read and ignore data members
while(true) while(true)
...@@ -1587,12 +1589,15 @@ bool CXMeshFileLoader::parseDataObjectAnimationKey(ISkinnedMesh::SJoint *joint) ...@@ -1587,12 +1589,15 @@ bool CXMeshFileLoader::parseDataObjectAnimationKey(ISkinnedMesh::SJoint *joint)
keyP->frame=time; keyP->frame=time;
keyP->position=mat.getTranslation(); keyP->position=mat.getTranslation();
/*
core::vector3df scale=mat.getScale(); core::vector3df scale=mat.getScale();
//if (scale.X==0) scale.X=1; if (scale.X==0)
//if (scale.Y==0) scale.Y=1; scale.X=1;
//if (scale.Z==0) scale.Z=1; if (scale.Y==0)
/* scale.Y=1;
if (scale.Z==0)
scale.Z=1;
ISkinnedMesh::SScaleKey *keyS=AnimatedMesh->createScaleKey(joint); ISkinnedMesh::SScaleKey *keyS=AnimatedMesh->createScaleKey(joint);
keyS->frame=time; keyS->frame=time;
keyS->scale=scale; keyS->scale=scale;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment