#include <string>
#include <cstring>
+#include <osg/Object>
#include <osgDB/Registry>
#include <boost/bind.hpp>
#include <boost/multi_index/member.hpp>
#include <boost/multi_index/ordered_index.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<
template<typename T>
struct SimplePropertyMap
{
- typedef std::map<string, T> map_type;
+ typedef std::map<std::string, T> map_type;
map_type _map;
template<int N>
SimplePropertyMap(const EffectNameValue<T> (&attrs)[N])
{
using namespace effect;
typename EffectPropertyMap<T>::BMap::iterator itr
- = pMap._map.get<from>().find(name);
+ = pMap._map.template get<from>().find(name);
if (itr == pMap._map.end()) {
- throw effect::BuilderException(string("findAttr: could not find attribute ")
- + string(name));
+ throw effect::BuilderException(std::string("findAttr: could not find attribute ")
+ + std::string(name));
} else {
result = itr->second;
}
{
using namespace effect;
typename EffectPropertyMap<T>::BMap::iterator itr
- = pMap._map.get<from>().find(name);
+ = pMap._map.template get<from>().find(name);
if (itr == pMap._map.end())
return 0;
else
using namespace effect;
std::string result;
typename EffectPropertyMap<T>::BMap::template index_iterator<to>::type itr
- = pMap._map.get<to>().find(value);
- if (itr != pMap._map.get<to>().end())
+ = pMap._map.template get<to>().find(value);
+ if (itr != pMap._map.template get<to>().end())
result = itr->first;
return result;
}
* 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;
PropertyList useProps = prop->getChildren("use");
if (useProps.size() == 1) {
string parentName = useProps[0]->getStringValue();
- if (parentName.size() == 0 || parentName[0] != '/')
- parentName = options->getPropRoot()->getPath() + "/" + parentName;
+ if (parentName.empty() || parentName[0] != '/')
+ parentName = options->getPropertyNode()->getPath() + "/" + parentName;
if (parentName[parentName.size() - 1] != '/')
parentName.append("/");
NameItr itr = defaultNames;
itr != end;
++itr) {
string childName = (*itr)->getStringValue();
- if (childName.size() == 0 || childName[0] != '/')
+ if (childName.empty() || childName[0] != '/')
result.push_back(parentName + childName);
else
result.push_back(childName);
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)
{
template<typename T>
struct InstallAttributeBuilder
{
- InstallAttributeBuilder(const string& name)
+ InstallAttributeBuilder(const std::string& name)
{
PassAttributeBuilder::PassAttrMapSingleton::instance()
->passAttrMap.insert(make_pair(name, new T));
(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,
template<typename OSGParamType, typename ObjType, typename F>
void
initFromParameters(Effect* effect, const SGPropertyNode* prop, ObjType* obj,
- const F& setter, const SGReaderWriterXMLOptions* options)
+ const F& setter, const SGReaderWriterOptions* options)
{
const SGPropertyNode* valProp = getEffectPropertyNode(effect, prop);
if (!valProp)
if (valProp->nChildren() == 0) {
setter(obj, valProp->getValue<OSGParamType>());
} else {
+ setDynamicVariance(obj);
std::string propName = getGlobalProperty(valProp, options);
ScalarChangeListener<OSGParamType, ObjType, F>* listener
= new ScalarChangeListener<OSGParamType, ObjType, F>(obj, setter,
inline void
initFromParameters(Effect* effect, const SGPropertyNode* prop, ObjType* obj,
SetterReturn (ObjType::*setter)(const OSGParamType),
- const SGReaderWriterXMLOptions* options)
+ const SGReaderWriterOptions* options)
{
initFromParameters<OSGParamType>(effect, prop, obj,
boost::bind(setter, _1, _2), options);
void
initFromParameters(Effect* effect, const SGPropertyNode* prop, ObjType* obj,
const F& setter,
- NameItrType nameItr, const SGReaderWriterXMLOptions* options)
+ NameItrType nameItr, const SGReaderWriterOptions* options)
{
typedef typename Bridge<OSGParamType>::sg_type sg_type;
const int numComponents = props::NumComponents<sg_type>::num_components;
if (valProp->nChildren() == 0) { // Has <use>?
setter(obj, Bridge<OSGParamType>::get(valProp->getValue<sg_type>()));
} else {
+ setDynamicVariance(obj);
std::vector<std::string> paramNames
= getVectorProperties(valProp, options,numComponents, nameItr);
if (paramNames.empty())
inline void
initFromParameters(Effect* effect, const SGPropertyNode* prop, ObjType* obj,
SetterReturn (ObjType::*setter)(const OSGParamType&),
- NameItrType nameItr, const SGReaderWriterXMLOptions* options)
+ NameItrType nameItr, const SGReaderWriterOptions* options)
{
initFromParameters<OSGParamType>(effect, prop, obj,
boost::bind(setter, _1, _2), nameItr,