removing using namespace std from header files
This commit is contained in:
parent
2c1279f880
commit
090e0e438e
|
@ -26,7 +26,7 @@ typedef unsigned __int64 uint64_t;
|
||||||
|
|
||||||
#include "provider.h"
|
#include "provider.h"
|
||||||
|
|
||||||
using namespace std;
|
//using namespace std;
|
||||||
/* this cache system enforce the rule that the items in a cache are always in all the cache below */
|
/* this cache system enforce the rule that the items in a cache are always in all the cache below */
|
||||||
/* two mechanism to remove tokens from the cache:
|
/* two mechanism to remove tokens from the cache:
|
||||||
1) set token count to something low
|
1) set token count to something low
|
||||||
|
@ -169,7 +169,7 @@ protected:
|
||||||
if(unload() || load()) {
|
if(unload() || load()) {
|
||||||
new_data.testAndSetOrdered(0, 1); //if not changed, set as changed
|
new_data.testAndSetOrdered(0, 1); //if not changed, set as changed
|
||||||
input->check_queue.open(); //we signal ourselves to check again
|
input->check_queue.open(); //we signal ourselves to check again
|
||||||
cout << "loaded or unloaded\n";
|
std::cout << "loaded or unloaded\n";
|
||||||
}
|
}
|
||||||
input->check_queue.leave();
|
input->check_queue.leave();
|
||||||
}
|
}
|
||||||
|
|
|
@ -59,7 +59,7 @@ Adding copyright.
|
||||||
#include <vcg/space/line3.h>
|
#include <vcg/space/line3.h>
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
using namespace std;
|
//using namespace std;
|
||||||
|
|
||||||
namespace vcg {
|
namespace vcg {
|
||||||
|
|
||||||
|
|
|
@ -82,7 +82,7 @@ void SphereMode::Apply (Trackball * tb, Point3f new_point)
|
||||||
// Figure out how much to rotate around that axis.
|
// Figure out how much to rotate around that axis.
|
||||||
// float phi = Distance (hitNew, hitOld) / tb->radius;
|
// float phi = Distance (hitNew, hitOld) / tb->radius;
|
||||||
// float phi = vcg::Angle(hitNew - center,hitOld - center)*(Distance(hitNew,center)/tb->radius);
|
// float phi = vcg::Angle(hitNew - center,hitOld - center)*(Distance(hitNew,center)/tb->radius);
|
||||||
float phi = max(vcg::Angle(hitNew - center,hitOld - center),(Distance(hitNew,hitOld)/tb->radius)) ;
|
float phi = std::max(vcg::Angle(hitNew - center,hitOld - center),(Distance(hitNew,hitOld)/tb->radius)) ;
|
||||||
|
|
||||||
tb->track.rot = Quaternionf (-phi, axis) * tb->last_track.rot;
|
tb->track.rot = Quaternionf (-phi, axis) * tb->last_track.rot;
|
||||||
}
|
}
|
||||||
|
@ -128,12 +128,12 @@ void ZMode::Draw(Trackball * tb){
|
||||||
// Scale mode implementation.
|
// Scale mode implementation.
|
||||||
void ScaleMode::Apply (Trackball * tb, float WheelNotch)
|
void ScaleMode::Apply (Trackball * tb, float WheelNotch)
|
||||||
{
|
{
|
||||||
tb->track.sca *= pow (1.2f, -WheelNotch);
|
tb->track.sca *= std::pow (1.2f, -WheelNotch);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScaleMode::Apply (Trackball * tb, Point3f new_point)
|
void ScaleMode::Apply (Trackball * tb, Point3f new_point)
|
||||||
{
|
{
|
||||||
tb->track.sca = tb->last_track.sca * pow (3.0f, -(getDeltaY(tb,new_point)));
|
tb->track.sca = tb->last_track.sca * std::pow (3.0f, -(getDeltaY(tb,new_point)));
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScaleMode::Draw(Trackball * tb){
|
void ScaleMode::Draw(Trackball * tb){
|
||||||
|
@ -787,7 +787,7 @@ void NavigatorWasdMode::Animate(unsigned int msec, Trackball * tb){
|
||||||
float vel = current_speed_h.Norm();
|
float vel = current_speed_h.Norm();
|
||||||
if (vel<topSpeedH*0.05) {
|
if (vel<topSpeedH*0.05) {
|
||||||
// stopped: decrease step heigth to zero
|
// stopped: decrease step heigth to zero
|
||||||
step_current*=pow(dumping,sec);
|
step_current*=std::pow(dumping,sec);
|
||||||
if (step_current<step_height*0.06) { step_current=0; step_x=0.0f;}
|
if (step_current<step_height*0.06) { step_current=0; step_x=0.0f;}
|
||||||
} else {
|
} else {
|
||||||
// running: rise step heigth
|
// running: rise step heigth
|
||||||
|
@ -797,7 +797,7 @@ void NavigatorWasdMode::Animate(unsigned int msec, Trackball * tb){
|
||||||
if (step_current<step_current_min) step_current=step_current_min;
|
if (step_current<step_current_min) step_current=step_current_min;
|
||||||
}
|
}
|
||||||
|
|
||||||
current_speed*=pow(dumping,sec);
|
current_speed*=std::pow(dumping,sec);
|
||||||
if (current_speed.Norm()<topSpeedH*0.005) current_speed.SetZero(); // full stop
|
if (current_speed.Norm()<topSpeedH*0.005) current_speed.SetZero(); // full stop
|
||||||
|
|
||||||
tb->track.tra[1]+=step_last;
|
tb->track.tra[1]+=step_last;
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
#include <wrap/gl/space.h>
|
#include <wrap/gl/space.h>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
using namespace std;
|
//using namespace std;
|
||||||
|
|
||||||
namespace vcg {
|
namespace vcg {
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue