return propNodeGhostCreate(_context, handle);
}
+SGPropertyNode* ghostToPropNode(naRef ref)
+{
+ if (!naIsGhost(ref) || (naGhost_type(ref) != &PropNodeGhostType))
+ return NULL;
+
+ SGPropertyNode_ptr* pp = (SGPropertyNode_ptr*) naGhost_ptr(ref);
+ return pp->ptr();
+}
+
#define NASTR(s) s ? naStr_fromdata(naNewString(c),(char*)(s),strlen(s)) : naNil()
//
case props::DOUBLE:
{
double dv = (*node)->getDoubleValue();
- if (osg::isNaN(dv)) {
+ if (SGMisc<double>::isNaN(dv)) {
SG_LOG(SG_NASAL, SG_ALERT, "Nasal getValue: property " << (*node)->getPath() << " is NaN");
return naNil();
}
naRuntimeError(c, "props.setValue() with non-number");
double d = naNumValue(val).num;
- if (osg::isNaN(d)) {
+ if (SGMisc<double>::isNaN(d)) {
naRuntimeError(c, "props.setValue() passed a NaN");
}
if (naIsNil(r))
naRuntimeError(c, "props.setDoubleValue() with non-number");
- if (osg::isNaN(r.num)) {
+ if (SGMisc<double>::isNaN(r.num)) {
naRuntimeError(c, "props.setDoubleValue() passed a NaN");
}
naRef child = naVec_get(argv, 0);
if(!naIsString(child)) return naNil();
naRef idx = naNumValue(naVec_get(argv, 1));
- bool create = naTrue(naVec_get(argv, 2));
+ bool create = naTrue(naVec_get(argv, 2)) != 0;
SGPropertyNode* n;
try {
if(naIsNil(idx) || !naIsNum(idx)) {
return result;
}
+static naRef f_addChild(naContext c, naRef me, int argc, naRef* args)
+{
+ NODEARG();
+ naRef child = naVec_get(argv, 0);
+ if(!naIsString(child)) return naNil();
+ naRef ref_min_index = naNumValue(naVec_get(argv, 1));
+ naRef ref_append = naVec_get(argv, 2);
+ SGPropertyNode* n;
+ try
+ {
+ int min_index = 0;
+ if( !naIsNil(ref_min_index) && naIsNum(ref_min_index) )
+ min_index = ref_min_index.num;
+
+ bool append = true;
+ if( !naIsNil(ref_append) )
+ append = naTrue(ref_append) != 0;
+
+ n = (*node)->addChild(naStr_data(child), min_index, append);
+ }
+ catch (const string& err)
+ {
+ naRuntimeError(c, (char *)err.c_str());
+ return naNil();
+ }
+
+ return propNodeGhostCreate(c, n);
+}
+
+static naRef f_addChildren(naContext c, naRef me, int argc, naRef* args)
+{
+ NODEARG();
+ naRef child = naVec_get(argv, 0);
+ if(!naIsString(child)) return naNil();
+ naRef ref_count = naNumValue(naVec_get(argv, 1));
+ naRef ref_min_index = naNumValue(naVec_get(argv, 2));
+ naRef ref_append = naVec_get(argv, 3);
+ try
+ {
+ size_t count = 0;
+ if( !naIsNum(ref_count) )
+ throw string("props.addChildren() missing number of children");
+ count = ref_count.num;
+
+ int min_index = 0;
+ if( !naIsNil(ref_min_index) && naIsNum(ref_min_index) )
+ min_index = ref_min_index.num;
+
+ bool append = true;
+ if( !naIsNil(ref_append) )
+ append = naTrue(ref_append) != 0;
+
+ const simgear::PropertyList& nodes =
+ (*node)->addChildren(naStr_data(child), count, min_index, append);
+
+ naRef result = naNewVector(c);
+ for( size_t i = 0; i < nodes.size(); ++i )
+ naVec_append(result, propNodeGhostCreate(c, nodes[i]));
+ return result;
+ }
+ catch (const string& err)
+ {
+ naRuntimeError(c, (char *)err.c_str());
+ }
+
+ return naNil();
+}
+
static naRef f_removeChild(naContext c, naRef me, int argc, naRef* args)
{
NODEARG();
if(naIsNil(argv) || naVec_size(argv) == 0) {
// Remove all children
for(int i = (*node)->nChildren() - 1; i >=0; i--)
- naVec_append(result, propNodeGhostCreate(c, (*node)->removeChild(i)));
+ naVec_append(result, propNodeGhostCreate(c, (*node)->removeChild(i, false)));
} else {
// Remove all children of a specified name
naRef name = naVec_get(argv, 0);
{
NODEARG();
naRef path = naVec_get(argv, 0);
- bool create = naTrue(naVec_get(argv, 1));
+ bool create = naTrue(naVec_get(argv, 1)) != 0;
if(!naIsString(path)) return naNil();
SGPropertyNode* n;
try {
{ f_getParent, "_getParent" },
{ f_getChild, "_getChild" },
{ f_getChildren, "_getChildren" },
+ { f_addChild, "_addChild" },
+ { f_addChildren, "_addChildren" },
{ f_removeChild, "_removeChild" },
{ f_removeChildren, "_removeChildren" },
{ f_alias, "_alias" },