Commit 31d19f0d authored by Matthias Möller's avatar Matthias Möller
Browse files

adds std local namespace, where missing

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@14952 383ad7c9-94d9-4d36-a494-682f7c89f535
parent f0c7a88b
......@@ -43,6 +43,8 @@
#ifndef BASESKIN_HH
#define BASESKIN_HH
#include <map>
#include "OpenFlipper/common/perObjectData.hh"
#include <ObjectTypes/Skeleton/SkeletonT.hh>
......@@ -87,7 +89,7 @@ public:
* a vertex. Therefore they are stored in a map using the joint identifier as key. The weights for one
* vertex are supposed to sum to one.
*/
typedef map<unsigned int, double> SkinWeights;
typedef std::map<unsigned int, double> SkinWeights;
//@}
/**
......
......@@ -42,7 +42,7 @@
#define POSET_C
#include <assert.h>
#include <cassert>
//-----------------------------------------------------------------------------
......
......@@ -317,8 +317,8 @@ void SkeletonObject::updateIndices(const AnimationHandle &_hAni)
PoseT<OpenMesh::Vec3d> *pose = skeleton_->pose(_hAni);
for(unsigned int i = 0; i < skeleton_->jointCount(); ++i)
{
stringstream buf;
string nameTransformNode;
std::stringstream buf;
std::string nameTransformNode;
buf << "TextNode " << i << " Transform";
nameTransformNode = buf.str();
......@@ -336,8 +336,8 @@ void SkeletonObject::updateIndices(const AnimationHandle &_hAni)
unsigned int i = skeleton_->jointCount();
bool bAdditionalNodes = true;
do{
stringstream buf;
string nameTransformNode;
std::stringstream buf;
std::string nameTransformNode;
buf << "TextNode " << i << " Transform";
nameTransformNode = buf.str();
......@@ -381,8 +381,8 @@ void SkeletonObject::showIndices(bool _bVisible)
unsigned int i = skeleton_->jointCount();
bool bAdditionalNodes = true;
do{
stringstream buf;
string nameTransformNode;
std::stringstream buf;
std::string nameTransformNode;
buf << "TextNode " << i << " Transform";
nameTransformNode = buf.str();
......@@ -401,8 +401,8 @@ void SkeletonObject::showIndices(bool _bVisible)
PoseT<OpenMesh::Vec3d>* ref = skeleton_->referencePose();
for(unsigned int i = 0; i < skeleton_->jointCount(); ++i)
{
stringstream buf;
string nameJoint, nameTextNode, nameTransformNode, nameSubMatNode;
std::stringstream buf;
std::string nameJoint, nameTextNode, nameTransformNode, nameSubMatNode;
buf.str("");
buf << i;
......@@ -509,8 +509,8 @@ void SkeletonObject::updateMotionPath(const AnimationHandle &_hAni)
for(unsigned int i = 0; i < skeleton_->jointCount(); ++i)
{
stringstream buf;
string nameTransformNode;
std::stringstream buf;
std::string nameTransformNode;
buf << "LineNode " << i << " Transform";
nameTransformNode = buf.str();
......@@ -527,8 +527,8 @@ void SkeletonObject::updateMotionPath(const AnimationHandle &_hAni)
unsigned int i = skeleton_->jointCount();
bool bAdditionalNodes = true;
do{
stringstream buf;
string nameTransformNode;
std::stringstream buf;
std::string nameTransformNode;
buf << "LineNode " << i << " Transform";
nameTransformNode = buf.str();
......@@ -572,8 +572,8 @@ void SkeletonObject::showMotionPath(bool _visible)
unsigned int i = skeleton_->jointCount();
bool bAdditionalNodes = true;
do{
stringstream buf;
string nameTransformNode;
std::stringstream buf;
std::string nameTransformNode;
buf << "LineNode " << i << " Transform";
nameTransformNode = buf.str();
......@@ -594,8 +594,8 @@ void SkeletonObject::showMotionPath(bool _visible)
for(unsigned int i = 0; i < skeleton_->jointCount(); ++i)
{
stringstream buf;
string nameJoint, nameLineNode, nameTransformNode, nameSubMatNode;
std::stringstream buf;
std::string nameJoint, nameLineNode, nameTransformNode, nameSubMatNode;
buf.str("");
buf << i;
......
......@@ -384,7 +384,7 @@ int FileBVHPlugin::loadObject(QString _filename) {
if ( (waitingFor == CHANNEL_DATA) ){
// a vector to store all the data for this frame
vector<double> data(dataOffset,0.0);
std::vector<double> data(dataOffset,0.0);
Skeleton::Pose* pose = 0;
......@@ -461,7 +461,7 @@ int FileBVHPlugin::loadObject(QString _filename) {
}
std::cerr << "Error: No match for keyword '" << keyWrd << "' ";
std::cerr << "waiting for : " << waitingFor.to_string<char,char_traits<char>,allocator<char> >() << std::endl;
std::cerr << "waiting for : " << waitingFor.to_string<char,std::char_traits<char>,std::allocator<char> >() << std::endl;
}
......
......@@ -79,16 +79,16 @@ bool FileSKLPlugin::LoadSkeleton(Skeleton *_pSkeleton, QString _filename)
unsigned int nJoints = 0;
ifstream in(_filename.toStdString().c_str(), ofstream::in);
std::ifstream in(_filename.toStdString().c_str(), std::ofstream::in);
// read number of joints
in >> nJoints;
Pose *ref = _pSkeleton->referencePose();
// remember parent joints
map<unsigned int, Joint*> parents;
std::map<unsigned int, Joint*> parents;
map<unsigned int, unsigned int> jointMap;
std::map<unsigned int, unsigned int> jointMap;
for(unsigned int i = 0; i < nJoints; ++i)
{
......@@ -157,7 +157,7 @@ bool FileSKLPlugin::LoadSkeleton(Skeleton *_pSkeleton, QString _filename)
in >> frameCount;
} else {
istringstream tmp(identifier);
std::istringstream tmp(identifier);
tmp >> frameCount;
}
......@@ -234,7 +234,7 @@ bool FileSKLPlugin::SaveSkeleton(Skeleton *_pSkeleton, QString _filename)
typedef PoseT<typename Skeleton::Point> Pose;
typedef ACG::Matrix4x4T<typename Skeleton::Scalar> Matrix;
ofstream out(_filename.toStdString().c_str(), ofstream::out);
std::ofstream out(_filename.toStdString().c_str(), std::ofstream::out);
// write the number of joints
out << _pSkeleton->jointCount() << endl;
......
......@@ -1765,7 +1765,7 @@ void PropertyVisPlugin::getPropertyValue( MeshT* _mesh , int _id, unsigned int _
BaseSkin::SkinWeights value = _mesh->property(prop, typename MeshT::VertexHandle(closestVertex));
QString text = "";
for (map<unsigned int, double>::iterator it = value.begin(); it != value.end(); ++it) {
for (std::map<unsigned int, double>::iterator it = value.begin(); it != value.end(); ++it) {
text += "(";
text += QString::number((*it).first);
text += ",";
......
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