Changed: Minor changes
--HG-- branch : develop
This commit is contained in:
parent
7b2b0c9310
commit
e2dda1585d
7 changed files with 36 additions and 20 deletions
|
@ -46,7 +46,7 @@ public:
|
||||||
double getSamplingPeriod() const { return _SamplingPeriod; }
|
double getSamplingPeriod() const { return _SamplingPeriod; }
|
||||||
// Reset smoother. The next returned position will be the exact position of mouse (no smoothing with previous position is done)
|
// Reset smoother. The next returned position will be the exact position of mouse (no smoothing with previous position is done)
|
||||||
void reset();
|
void reset();
|
||||||
// \return trueif no sampling has occurred since last resetor construction
|
// \return true if no sampling has occurred since last resetor construction
|
||||||
bool isReseted() const { return !_Init; }
|
bool isReseted() const { return !_Init; }
|
||||||
// Sample pos, and return smoothed position
|
// Sample pos, and return smoothed position
|
||||||
CVector2f samplePos(const CVector2f &wantedPos, double date);
|
CVector2f samplePos(const CVector2f &wantedPos, double date);
|
||||||
|
|
|
@ -1802,7 +1802,7 @@ namespace NLGUI
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------------------------
|
// ------------------------------------------------------------------------------------------------
|
||||||
int CGroupSubMenu::luaAddIconLine(CLuaState &ls)
|
int CGroupSubMenu::luaAddIconLine(CLuaState &ls)
|
||||||
{
|
{
|
||||||
const char *funcName = "addIconLine";
|
const char *funcName = "addIconLine";
|
||||||
|
|
|
@ -633,7 +633,7 @@ void toLower(char *str)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string toUpper(const std::string &str)
|
std::string toUpper(const std::string &str)
|
||||||
{
|
{
|
||||||
string res;
|
string res;
|
||||||
res.reserve(str.size());
|
res.reserve(str.size());
|
||||||
|
@ -647,7 +647,7 @@ std::string toUpper(const std::string &str)
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
void toUpper(char *str)
|
void toUpper(char *str)
|
||||||
{
|
{
|
||||||
if (str == 0)
|
if (str == 0)
|
||||||
return;
|
return;
|
||||||
|
@ -1356,7 +1356,7 @@ std::string escapeArgument(const std::string &arg)
|
||||||
// we can't escape %VARIABLE% on command-line under Windows
|
// we can't escape %VARIABLE% on command-line under Windows
|
||||||
return arg;
|
return arg;
|
||||||
#else
|
#else
|
||||||
// characters to escapce, only " and $ (to prevent a $something replaced by an environment variable)
|
// characters to escape, only " and $ (to prevent a $something replaced by an environment variable)
|
||||||
static const char s_charsToEscape[] = "\"$";
|
static const char s_charsToEscape[] = "\"$";
|
||||||
|
|
||||||
std::string res;
|
std::string res;
|
||||||
|
|
|
@ -828,7 +828,6 @@ void CUnifiedNetwork::addService(const string &name, const vector<CInetAddress>
|
||||||
for (uint i = 0; i < addr.size(); i++)
|
for (uint i = 0; i < addr.size(); i++)
|
||||||
{
|
{
|
||||||
// first we have to look if we have a network that can established the connection
|
// first we have to look if we have a network that can established the connection
|
||||||
|
|
||||||
uint j = 0;
|
uint j = 0;
|
||||||
|
|
||||||
// it's loopback ip address, it's ok
|
// it's loopback ip address, it's ok
|
||||||
|
|
|
@ -800,7 +800,8 @@ bool CEntityManager::setupInstance(uint32 idx, const vector<string> &keys, const
|
||||||
if (param == "transparency")
|
if (param == "transparency")
|
||||||
{
|
{
|
||||||
uint t;
|
uint t;
|
||||||
if( fromString( values[i], t ) ) {
|
if (fromString(values[i], t))
|
||||||
|
{
|
||||||
t = max(0, min((int)t, 255));
|
t = max(0, min((int)t, 255));
|
||||||
makeInstanceTransparent(instance, t, t == 255);
|
makeInstanceTransparent(instance, t, t == 255);
|
||||||
}
|
}
|
||||||
|
@ -864,9 +865,12 @@ bool CEntityManager::setupInstance(uint32 idx, const vector<string> &keys, const
|
||||||
float v;
|
float v;
|
||||||
CVector pos = getInstancePos(idx);
|
CVector pos = getInstancePos(idx);
|
||||||
|
|
||||||
if( getRelativeFloatFromString( values[i], v ) ) {
|
if (getRelativeFloatFromString(values[i], v))
|
||||||
|
{
|
||||||
updateVector(param, pos, v, true);
|
updateVector(param, pos, v, true);
|
||||||
} else {
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
updateVector(param, pos, v, false);
|
updateVector(param, pos, v, false);
|
||||||
}
|
}
|
||||||
setInstancePos(idx, pos);
|
setInstancePos(idx, pos);
|
||||||
|
@ -877,9 +881,12 @@ bool CEntityManager::setupInstance(uint32 idx, const vector<string> &keys, const
|
||||||
float v;
|
float v;
|
||||||
CVector rot = getInstanceRot(idx);
|
CVector rot = getInstanceRot(idx);
|
||||||
|
|
||||||
if( getRelativeFloatFromString( values[i], v ) ) {
|
if (getRelativeFloatFromString(values[i], v))
|
||||||
|
{
|
||||||
updateVector(param, rot, v, true);
|
updateVector(param, rot, v, true);
|
||||||
} else {
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
updateVector(param, rot, v, false);
|
updateVector(param, rot, v, false);
|
||||||
}
|
}
|
||||||
setInstanceRot(idx, rot);
|
setInstanceRot(idx, rot);
|
||||||
|
@ -889,9 +896,12 @@ bool CEntityManager::setupInstance(uint32 idx, const vector<string> &keys, const
|
||||||
float v;
|
float v;
|
||||||
CVector scale = instance.getScale();
|
CVector scale = instance.getScale();
|
||||||
|
|
||||||
if( getRelativeFloatFromString( values[i], v ) ) {
|
if (getRelativeFloatFromString(values[i], v))
|
||||||
|
{
|
||||||
updateVector(param, scale, v, true);
|
updateVector(param, scale, v, true);
|
||||||
} else {
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
updateVector(param, scale, v, false);
|
updateVector(param, scale, v, false);
|
||||||
}
|
}
|
||||||
instance.setScale(scale);
|
instance.setScale(scale);
|
||||||
|
@ -909,9 +919,12 @@ bool CEntityManager::setupInstance(uint32 idx, const vector<string> &keys, const
|
||||||
|
|
||||||
CVector size = CVector(width, depth, height);
|
CVector size = CVector(width, depth, height);
|
||||||
float v;
|
float v;
|
||||||
if( getRelativeFloatFromString( values[i], v ) ) {
|
if (getRelativeFloatFromString(values[i], v))
|
||||||
|
{
|
||||||
updateVector(param, size, v, true);
|
updateVector(param, size, v, true);
|
||||||
} else {
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
updateVector(param, size, v, false);
|
updateVector(param, size, v, false);
|
||||||
}
|
}
|
||||||
primitive->setSize(size.x, size.y);
|
primitive->setSize(size.x, size.y);
|
||||||
|
@ -922,9 +935,12 @@ bool CEntityManager::setupInstance(uint32 idx, const vector<string> &keys, const
|
||||||
CVector pos = instance.getPos();
|
CVector pos = instance.getPos();
|
||||||
float v;
|
float v;
|
||||||
|
|
||||||
if( getRelativeFloatFromString( values[i], v ) ) {
|
if (getRelativeFloatFromString(values[i], v))
|
||||||
|
{
|
||||||
updateVector(param, _ShapeInstances[idx].PrimRelativePos, v, false);
|
updateVector(param, _ShapeInstances[idx].PrimRelativePos, v, false);
|
||||||
} else {
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
if (param == "col pos x")
|
if (param == "col pos x")
|
||||||
_ShapeInstances[idx].PrimRelativePos.x = v - pos.x;
|
_ShapeInstances[idx].PrimRelativePos.x = v - pos.x;
|
||||||
if (param == "col pos y")
|
if (param == "col pos y")
|
||||||
|
@ -1023,7 +1039,8 @@ CShapeInstanceReference CEntityManager::getShapeInstanceUnderPos(float x, float
|
||||||
// if intersect the bbox
|
// if intersect the bbox
|
||||||
NLMISC::CAABBox bbox;
|
NLMISC::CAABBox bbox;
|
||||||
//= _ShapeInstances[i].SelectionBox;
|
//= _ShapeInstances[i].SelectionBox;
|
||||||
if(!_ShapeInstances[i].Instance.empty()) {
|
if(!_ShapeInstances[i].Instance.empty())
|
||||||
|
{
|
||||||
_ShapeInstances[i].Instance.getShapeAABBox(bbox);
|
_ShapeInstances[i].Instance.getShapeAABBox(bbox);
|
||||||
CVector bbox_min;
|
CVector bbox_min;
|
||||||
CVector bbox_max;
|
CVector bbox_max;
|
||||||
|
|
Loading…
Reference in a new issue