From 71247a018652cf5ac4894e1f242daccd971e41bb Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 26 Sep 2015 12:18:18 +0200
Subject: [PATCH] inserted TagBase between ObjectTag and osg::Referenced

---
 apps/opencs/CMakeLists.txt          |  2 +-
 apps/opencs/view/render/object.cpp  |  5 +++++
 apps/opencs/view/render/object.hpp  | 17 ++++++++---------
 apps/opencs/view/render/tagbase.cpp |  9 +++++++++
 apps/opencs/view/render/tagbase.hpp | 22 ++++++++++++++++++++++
 5 files changed, 45 insertions(+), 10 deletions(-)
 create mode 100644 apps/opencs/view/render/tagbase.cpp
 create mode 100644 apps/opencs/view/render/tagbase.hpp

diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index f9a73a09f8..cfa9384737 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -90,7 +90,7 @@ opencs_units (view/render
 
 opencs_units_noqt (view/render
     lighting lightingday lightingnight
-    lightingbright object cell terrainstorage
+    lightingbright object cell terrainstorage tagbase
     )
 
 opencs_hdrs_noqt (view/render
diff --git a/apps/opencs/view/render/object.cpp b/apps/opencs/view/render/object.cpp
index c7485c8911..ac96cb2835 100644
--- a/apps/opencs/view/render/object.cpp
+++ b/apps/opencs/view/render/object.cpp
@@ -38,6 +38,11 @@ namespace
 }
 
 
+CSVRender::ObjectTag::ObjectTag (Object* object)
+: TagBase (Element_Reference), mObject (object)
+{}
+
+
 void CSVRender::Object::clear()
 {
 }
diff --git a/apps/opencs/view/render/object.hpp b/apps/opencs/view/render/object.hpp
index 1a1295b530..0858a2edb2 100644
--- a/apps/opencs/view/render/object.hpp
+++ b/apps/opencs/view/render/object.hpp
@@ -8,8 +8,9 @@
 #include <osg/ref_ptr>
 #include <osg/Referenced>
 
-class QModelIndex;
+#include "tagbase.hpp"
 
+class QModelIndex;
 
 namespace osg
 {
@@ -35,21 +36,19 @@ namespace CSMWorld
 
 namespace CSVRender
 {
-
     class Object;
 
     // An object to attach as user data to the osg::Node, allows us to get an Object back from a Node when we are doing a ray query
-    class ObjectTag : public osg::Referenced
+    class ObjectTag : public TagBase
     {
-    public:
-        ObjectTag (Object* obj)
-            : mObject(obj)
-        {
-        }
+        public:
 
-        Object* mObject;
+            ObjectTag (Object* object);
+
+            Object* mObject;
     };
 
+
     class Object
     {
             const CSMWorld::Data& mData;
diff --git a/apps/opencs/view/render/tagbase.cpp b/apps/opencs/view/render/tagbase.cpp
new file mode 100644
index 0000000000..af9a376243
--- /dev/null
+++ b/apps/opencs/view/render/tagbase.cpp
@@ -0,0 +1,9 @@
+
+#include "tagbase.hpp"
+
+CSVRender::TagBase::TagBase (Elements element) : mElement (element) {}
+
+CSVRender::Elements CSVRender::TagBase::getElement() const
+{
+    return mElement;
+}
diff --git a/apps/opencs/view/render/tagbase.hpp b/apps/opencs/view/render/tagbase.hpp
new file mode 100644
index 0000000000..874b856c63
--- /dev/null
+++ b/apps/opencs/view/render/tagbase.hpp
@@ -0,0 +1,22 @@
+#ifndef OPENCS_VIEW_TAGBASE_H
+#define OPENCS_VIEW_TAGBASE_H
+
+#include <osg/Referenced>
+
+#include "elements.hpp"
+
+namespace CSVRender
+{
+    class TagBase : public osg::Referenced
+    {
+            Elements mElement;
+
+        public:
+
+            TagBase (Elements element);
+
+            Elements getElement() const;
+    };
+}
+
+#endif