mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-29 04:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

# Animate props.

Browse Source 
tex: Reverted recent WARN_RETURN(ERR_TEX_CODEC_CANNOT_HANDLE) changes,
since (I think) it shouldn't warn about that being returned (because it
intentionally happens frequently).
XMLWriter: Trivial inconsequential optimisations (avoiding temporary
strings).

This was SVN commit r3801.
This commit is contained in:
Ykkrosh
2006-04-23 22:22:18 +00:00
parent 15e8d9a0b3
commit 2fbb899bb5
14 changed files with 370 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/graphics/Model.cpp
+7 -6
View File
@@ -406,7 +406,7 @@ bool CModel::SetAnimation(CSkeletonAnim* anim, bool once, float speed, CSkeleton
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
// AddProp: add a prop to the model on the given point
void CModel::AddProp(SPropPoint* point, CModel* model)
void CModel::AddProp(SPropPoint* point, CModel* model, CObjectEntry* objectentry)
{
// position model according to prop point position
model->SetTransform(point->m_Transform);
@@ -415,8 +415,8 @@ void CModel::AddProp(SPropPoint* point, CModel* model)
// check if we're already using this point, and remove it if so
// (when a prop is removed it will also remove the prop point)
uint i;
for (i=0;i<m_Props.size();i++) {
if (m_Props[i].m_Point==point) {
for (i = 0; i < m_Props.size(); i++) {
if (m_Props[i].m_Point == point) {
delete m_Props[i].m_Model;
break;
}
@@ -424,8 +424,9 @@ void CModel::AddProp(SPropPoint* point, CModel* model)
// not using point; add new prop
Prop prop;
prop.m_Point=point;
prop.m_Model=model;
prop.m_Point = point;
prop.m_Model = model;
prop.m_ObjectEntry = objectentry;
m_Props.push_back(prop);
}
@@ -458,7 +459,7 @@ CModel* CModel::Clone() const
clone->SetFlags(m_Flags);
for (uint i=0;i<m_Props.size();i++) {
// eek! TODO, RC - need to investigate shallow clone here
clone->AddProp(m_Props[i].m_Point, m_Props[i].m_Model->Clone());
clone->AddProp(m_Props[i].m_Point, m_Props[i].m_Model->Clone(), m_Props[i].m_ObjectEntry);
}
return clone;
}