#include <string>
#include <cstring>
+#include <osg/Object>
#include <osgDB/Registry>
#include <boost/bind.hpp>
#include <simgear/math/SGMath.hxx>
#include <simgear/props/AtomicChangeListener.hxx>
#include <simgear/props/props.hxx>
-#include <simgear/scene/model/SGReaderWriterXMLOptions.hxx>
+#include <simgear/scene/util/SGReaderWriterOptions.hxx>
#include <simgear/structure/exception.hxx>
#include <simgear/structure/SGSharedPtr.hxx>
#include <simgear/structure/Singleton.hxx>
{
class Effect;
class Pass;
-class SGReaderWriterXMLOptions;
+class SGReaderWriterOptions;
/**
* Builder that returns an object, probably an OSG object.
{
public:
virtual ~EffectBuilder() {}
- virtual T* build(Effect* effect, const SGPropertyNode*,
- const SGReaderWriterXMLOptions* options) = 0;
- static T* buildFromType(Effect* effect, const std::string& type,
+ virtual T* build(Effect* effect, Pass* pass, const SGPropertyNode*,
+ const SGReaderWriterOptions* options) = 0;
+ static T* buildFromType(Effect* effect, Pass* pass, const std::string& type,
const SGPropertyNode*props,
- const SGReaderWriterXMLOptions* options)
+ const SGReaderWriterOptions* options)
{
BuilderMap& builderMap = getMap();
typename BuilderMap::iterator iter = builderMap.find(type);
if (iter != builderMap.end())
- return iter->second->build(effect, props, options);
+ return iter->second->build(effect, pass, props, options);
else
return 0;
}
template<typename FromType,typename ToType>
struct bidirectional_map
{
+#if _MSC_VER >= 1600
+ struct value_type {
+ FromType first;
+ ToType second;
+ value_type(FromType f, ToType s) : first(f),second(s){}
+ };
+#else
typedef std::pair<FromType,ToType> value_type;
+#endif
/* A bidirectional map can be simulated as a multi_index_container
* of pairs of (FromType,ToType) with two unique indices, one
* for each member of the pair.
*/
-
typedef multi_index_container<
value_type,
indexed_by<
_map.insert(typename BMap::value_type(attrs[i].first, attrs[i].second));
}
+// A one-way map that can be initialized using an array
+template<typename T>
+struct SimplePropertyMap
+{
+ typedef std::map<string, T> map_type;
+ map_type _map;
+ template<int N>
+ SimplePropertyMap(const EffectNameValue<T> (&attrs)[N])
+ {
+ for (int i = 0; i < N; ++i)
+ _map.insert(typename map_type::value_type(attrs[i].first,
+ attrs[i].second));
+ }
+};
+
class BuilderException : public sg_exception
{
public:
findAttr(pMap, name, result);
}
+// Versions that don't throw an error
+
+template<typename T>
+const T* findAttr(const effect::EffectPropertyMap<T>& pMap,
+ const char* name)
+{
+ using namespace effect;
+ typename EffectPropertyMap<T>::BMap::iterator itr
+ = pMap._map.get<from>().find(name);
+ if (itr == pMap._map.end())
+ return 0;
+ else
+ return &itr->second;
+}
+
+template<typename T>
+const T* findAttr(const effect::SimplePropertyMap<T>& pMap,
+ const char* name)
+{
+ using namespace effect;
+ typename SimplePropertyMap<T>::map_type::const_iterator itr
+ = pMap._map.find(name);
+ if (itr == pMap._map.end())
+ return 0;
+ else
+ return &itr->second;
+}
+
+template<typename T, template<class> class Map>
+const T* findAttr(const Map<T>& pMap,
+ const std::string& name)
+{
+ return findAttr(pMap, name.c_str());
+}
+
+
template<typename T>
std::string findName(const effect::EffectPropertyMap<T>& pMap, T value)
{
* mentioned node name.
*/
std::string getGlobalProperty(const SGPropertyNode* prop,
- const SGReaderWriterXMLOptions *);
+ const SGReaderWriterOptions *);
template<typename NameItr>
std::vector<std::string>
getVectorProperties(const SGPropertyNode* prop,
- const SGReaderWriterXMLOptions *options, size_t vecSize,
+ const SGReaderWriterOptions *options, size_t vecSize,
NameItr defaultNames)
{
using namespace std;
if (useProps.size() == 1) {
string parentName = useProps[0]->getStringValue();
if (parentName.size() == 0 || parentName[0] != '/')
- parentName = options->getPropRoot()->getPath() + "/" + parentName;
+ parentName = options->getPropertyNode()->getPath() + "/" + parentName;
if (parentName[parentName.size() - 1] != '/')
parentName.append("/");
NameItr itr = defaultNames;
- for (int i = 0; i < vecSize; ++i, ++itr)
+ for (size_t i = 0; i < vecSize; ++i, ++itr)
result.push_back(parentName + *itr);
} else if (useProps.size() == vecSize) {
string parentName = useProps[0]->getStringValue();
struct PassAttrMapSingleton : public simgear::Singleton<PassAttrMapSingleton>
{
PassAttrMap passAttrMap;
+
};
public:
+ virtual ~PassAttributeBuilder(); // anchor into the compilation unit.
+
virtual void buildAttribute(Effect* effect, Pass* pass,
const SGPropertyNode* prop,
- const SGReaderWriterXMLOptions* options)
+ const SGReaderWriterOptions* options)
= 0;
static PassAttributeBuilder* find(const std::string& str)
{
*
* General version, function takes obj, val
*/
-template<typename Obj, typename OSGParam, typename Func>
+template<typename OSGParam, typename Obj, typename Func>
struct OSGFunctor : public Bridge<OSGParam>
{
OSGFunctor(Obj* obj, const Func& func)
/**
* Version which uses a pointer to member function instead.
*/
-template<typename Obj, typename OSGParam>
-struct OSGFunctor<Obj, OSGParam, void (Obj::* const)(const OSGParam&)>
+template<typename OSGParam, typename Obj>
+struct OSGFunctor<OSGParam, Obj, void (Obj::* const)(const OSGParam&)>
: public Bridge<OSGParam>
{
typedef void (Obj::*const MemFunc)(const OSGParam&);
/**
* Typical convenience constructors
*/
-template<typename Obj, typename OSGParam, typename Func>
-OSGFunctor<Obj, OSGParam, Func> make_OSGFunctor(Obj* obj, const Func& func)
+template<typename OSGParam, typename Obj, typename Func>
+OSGFunctor<OSGParam, Obj, Func> make_OSGFunctor(Obj* obj, const Func& func)
{
- return OSGFunctor<Obj, OSGParam, Func>(obj, func);
+ return OSGFunctor<OSGParam, Obj, Func>(obj, func);
}
-template<typename Obj, typename OSGParam>
-OSGFunctor<Obj, OSGParam, void (Obj::*const)(const OSGParam&)>
+template<typename OSGParam, typename Obj>
+OSGFunctor<OSGParam, Obj, void (Obj::*const)(const OSGParam&)>
make_OSGFunctor(Obj* obj, void (Obj::*const func)(const OSGParam&))
{
- return OSGFunctor<Obj, OSGParam,
+ return OSGFunctor<OSGParam, Obj,
void (Obj::* const)(const OSGParam&)>(obj, func);
}
-template<typename ObjType, typename OSGParamType>
+template<typename OSGParamType, typename ObjType, typename F>
class ScalarChangeListener
: public SGPropertyChangeListener, public InitializeWhenAdded,
public Effect::Updater
{
public:
- typedef void (ObjType::*setter_type)(const OSGParamType);
- ScalarChangeListener(ObjType* obj, setter_type setter,
+ ScalarChangeListener(ObjType* obj, const F& setter,
const std::string& propName)
: _obj(obj), _setter(setter)
{
}
void valueChanged(SGPropertyNode* node)
{
- _obj->*setter(node->getValue<OSGParamType>());
+ _setter(_obj.get(), node->getValue<OSGParamType>());
}
void initOnAddImpl(Effect* effect, SGPropertyNode* propRoot)
{
}
private:
osg::ref_ptr<ObjType> _obj;
- setter_type _setter;
+ F _setter;
std::string* _propName;
};
(func, 0, namesBegin, namesEnd);
}
+/**
+ * Set DYNAMIC data variance on an osg::Object.
+ */
+
+inline void setDynamicVariance(void* obj)
+{
+}
+
+inline void setDynamicVariance(osg::Object* obj)
+{
+ obj->setDataVariance(osg::Object::DYNAMIC);
+}
+
/**
* Initialize the value and the possible updating of an effect
* attribute. If the value is specified directly, set it. Otherwise,
* For relative property names, the property root found in options is
* used.
*/
-template<typename ObjType, typename OSGParamType>
+template<typename OSGParamType, typename ObjType, typename F>
void
initFromParameters(Effect* effect, const SGPropertyNode* prop, ObjType* obj,
- void (ObjType::*setter)(const OSGParamType),
- const SGReaderWriterXMLOptions* options)
+ const F& setter, const SGReaderWriterOptions* options)
{
const SGPropertyNode* valProp = getEffectPropertyNode(effect, prop);
if (!valProp)
return;
+ setDynamicVariance(obj);
if (valProp->nChildren() == 0) {
- obj->*setter(valProp->getValue<OSGParamType>());
+ setter(obj, valProp->getValue<OSGParamType>());
} else {
- std::string propName = getGlobalProperty(prop, options);
- ScalarChangeListener<ObjType, OSGParamType>* listener
- = new ScalarChangeListener<ObjType, OSGParamType>(obj, setter,
- propName);
+ std::string propName = getGlobalProperty(valProp, options);
+ ScalarChangeListener<OSGParamType, ObjType, F>* listener
+ = new ScalarChangeListener<OSGParamType, ObjType, F>(obj, setter,
+ propName);
effect->addUpdater(listener);
}
}
+template<typename OSGParamType, typename ObjType, typename SetterReturn>
+inline void
+initFromParameters(Effect* effect, const SGPropertyNode* prop, ObjType* obj,
+ SetterReturn (ObjType::*setter)(const OSGParamType),
+ const SGReaderWriterOptions* options)
+{
+ initFromParameters<OSGParamType>(effect, prop, obj,
+ boost::bind(setter, _1, _2), options);
+}
+
/*
* Initialize vector parameters from individual properties.
* The parameter may be updated at runtime.
* For relative property names, the property root found in options is
* used.
*/
-template<typename ObjType, typename OSGParamType, typename NameItrType>
+template<typename OSGParamType, typename ObjType, typename NameItrType,
+ typename F>
void
initFromParameters(Effect* effect, const SGPropertyNode* prop, ObjType* obj,
- void (ObjType::*setter)(const OSGParamType&),
- NameItrType nameItr, const SGReaderWriterXMLOptions* options)
+ const F& setter,
+ NameItrType nameItr, const SGReaderWriterOptions* options)
{
typedef typename Bridge<OSGParamType>::sg_type sg_type;
const int numComponents = props::NumComponents<sg_type>::num_components;
const SGPropertyNode* valProp = getEffectPropertyNode(effect, prop);
if (!valProp)
return;
+ setDynamicVariance(obj);
if (valProp->nChildren() == 0) { // Has <use>?
- (obj->*setter)(Bridge<OSGParamType>
- ::get(valProp->getValue<sg_type>()));
+ setter(obj, Bridge<OSGParamType>::get(valProp->getValue<sg_type>()));
} else {
std::vector<std::string> paramNames
= getVectorProperties(valProp, options,numComponents, nameItr);
throw BuilderException();
std::vector<std::string>::const_iterator pitr = paramNames.begin();
Effect::Updater* listener
- = new_EEPropListener<sg_type>(make_OSGFunctor(obj, setter), 0,
- pitr, pitr + numComponents);
+ = new_EEPropListener<sg_type>(make_OSGFunctor<OSGParamType>
+ (obj, setter),
+ 0, pitr, pitr + numComponents);
effect->addUpdater(listener);
}
}
+template<typename OSGParamType, typename ObjType, typename NameItrType,
+ typename SetterReturn>
+inline void
+initFromParameters(Effect* effect, const SGPropertyNode* prop, ObjType* obj,
+ SetterReturn (ObjType::*setter)(const OSGParamType&),
+ NameItrType nameItr, const SGReaderWriterOptions* options)
+{
+ initFromParameters<OSGParamType>(effect, prop, obj,
+ boost::bind(setter, _1, _2), nameItr,
+ options);
+}
extern const char* colorFields[];
}
}
projects / simgear.git / blobdiff