cmake fix; silenced some warnings

pull/21/head
Marc Zinnschlag 13 years ago
parent 164a5c8fe4
commit f11bf49a90

@ -39,7 +39,7 @@ add_openmw_dir (mwscript
locals scriptmanager compilercontext interpretercontext cellextensions miscextensions
guiextensions soundextensions skyextensions statsextensions containerextensions
aiextensions controlextensions extensions globalscripts ref dialogueextensions
animationextensions
animationextensions transformationextensions
)
add_openmw_dir (mwsound

@ -165,7 +165,6 @@ namespace MWWorld
for (std::vector<std::pair<std::string, Ogre::Vector3> >::const_iterator iter (actors.begin());
iter!=actors.end(); ++iter)
{
OEngine::Physic::PhysicActor* act = mEngine->getCharacter(iter->first);
//dirty stuff to get the camera orientation. Must be changed!
Ogre::SceneNode *sceneNode = mRender.getScene()->getSceneNode (iter->first);

@ -82,17 +82,17 @@ static void vectorMulAdd(const Matrix &A, const Vector &B, float *C, float scale
}
// Computes B = AxB (matrix*vector)
static void vectorMul(const Matrix &A, float *C)
{
// Keep the original values
float a = C[0];
float b = C[1];
float c = C[2];
// Perform matrix multiplication, scaling and addition
for (int i=0;i<3;i++)
C[i] = a*A.v[i].array[0] + b*A.v[i].array[1] + c*A.v[i].array[2];
}
//static void vectorMul(const Matrix &A, float *C)
//{
// // Keep the original values
// float a = C[0];
// float b = C[1];
// float c = C[2];
// // Perform matrix multiplication, scaling and addition
// for (int i=0;i<3;i++)
// C[i] = a*A.v[i].array[0] + b*A.v[i].array[1] + c*A.v[i].array[2];
//}
ManualBulletShapeLoader::~ManualBulletShapeLoader()

Loading…
Cancel
Save