summaryrefslogtreecommitdiffstats
path: root/src/runtimerender/graphobjects/Qt3DSRenderEffect.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/runtimerender/graphobjects/Qt3DSRenderEffect.h')
-rw-r--r--src/runtimerender/graphobjects/Qt3DSRenderEffect.h18
1 files changed, 7 insertions, 11 deletions
diff --git a/src/runtimerender/graphobjects/Qt3DSRenderEffect.h b/src/runtimerender/graphobjects/Qt3DSRenderEffect.h
index e0db3d9..82e75db 100644
--- a/src/runtimerender/graphobjects/Qt3DSRenderEffect.h
+++ b/src/runtimerender/graphobjects/Qt3DSRenderEffect.h
@@ -47,15 +47,14 @@ namespace render {
// them and they have completely variable properties.
// see IEffectManager in order to create these effects.
// The data for the effect immediately follows the effect
- struct SEffect : public SDynamicObject
+ struct SEffect : public SDynamicGraphObject
{
- private:
- // These objects are only created via the dynamic object system.
- SEffect(const SEffect &);
- SEffect &operator=(const SEffect &);
- SEffect();
-
public:
+ SEffect(SDynamicObject *dynamicObject)
+ : SDynamicGraphObject(GraphObjectTypes::Effect, dynamicObject)
+ {
+ }
+
SLayer *m_Layer;
SEffect *m_NextEffect;
// Opaque pointer to context type implemented by the effect system.
@@ -63,9 +62,6 @@ namespace render {
// the first time it needs to render this effect.
SEffectContext *m_Context;
- typedef qt3ds::foundation::nvhash_map<CRegisteredString, SImage *> TImageMapHash;
- TImageMapHash *m_imageMaps;
-
CRegisteredString m_error;
void Initialize();
@@ -84,7 +80,7 @@ namespace render {
template <typename TRemapperType>
void Remap(TRemapperType &inRemapper)
{
- SDynamicObject::Remap(inRemapper);
+ SDynamicGraphObject::Remap(inRemapper);
inRemapper.Remap(m_Layer);
inRemapper.Remap(m_NextEffect);
inRemapper.NullPtr(m_Context);