zaki
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed minor mem leak in 3ds loader. Fixed texture translation in q3 shaders. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1334 dfc29bdd-3216-0410-991c-e03cc46cb475
master
hybrid 2008-04-29 12:14:07 +00:00
parent 22ffe908f8
commit cd6632de6c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/Irrlicht/C3DSMeshFileLoader.cpp
View File

@ -179,9 +179,13 @@ IAnimatedMesh* C3DSMeshFileLoader::createMesh(io::IReadFile* file)
{
SMesh tmp;
tmp.addMeshBuffer(mb);
IMesh* tangentMesh = SceneManager->getMeshManipulator()->createMeshWithTangents(&tmp);
mb->drop();
IMesh* tangentMesh = SceneManager->getMeshManipulator()->createMeshWithTangents(&tmp);
Mesh->MeshBuffers[i]=tangentMesh->getMeshBuffer(0);
// we need to grab because we replace the buffer manually.
Mesh->MeshBuffers[i]->grab();
// clean up intermediate mesh struct
tangentMesh->drop();
}
Mesh->MeshBuffers[i]->recalculateBoundingBox();
}

2
source/Irrlicht/CQuake3ShaderSceneNode.cpp
View File

@ -636,7 +636,7 @@ void CQuake3ShaderSceneNode::animate( u32 stage,core::matrix4 &texture )
// scroll
f0 = quake3::getAsFloat ( v.content, pos ) * TimeAbs;
f1 = quake3::getAsFloat ( v.content, pos ) * TimeAbs;
m2.setTextureTranslate ( -f0, f1 );
m2.setTextureTranslate ( f0, f1 );
break;
case 1:
// scale