Added Audio, Image, Movie, Model and Volume class to osgPresentation.

include/osgPresentation/Audio

@@ -0,0 +1,41 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
+ *
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * OpenSceneGraph Public License for more details.
+*/
+
+#ifndef OSGPRESENTATION_AUDIO
+#define OSGPRESENTATION_AUDIO 1
+
+#include <osgPresentation/Element>
+
+namespace osgPresentation {
+
+/** osgPresentation::Audio
+*/
+class OSGPRESENTATION_EXPORT Audio : public osgPresentation::Element
+{
+    public :
+
+        Audio() {}
+
+        /** Copy constructor using CopyOp to manage deep vs shallow copy. */
+        Audio(const Audio& audio,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY) : osgPresentation::Element(audio,copyop) {}
+
+        META_Node(osgPresentation, Audio);
+
+protected :
+
+        virtual ~Audio() {}
+};
+
+}
+
+#endif

include/osgPresentation/Element

@@ -18,7 +18,7 @@
 
 namespace osgPresentation {
 
-/** osgPresentation::Group
+/** osgPresentation::Element
 */
 class OSGPRESENTATION_EXPORT Element : public osgPresentation::Group
 {

include/osgPresentation/Image

@@ -0,0 +1,41 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
+ *
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * OpenSceneGraph Public License for more details.
+*/
+
+#ifndef OSGPRESENTATION_IMAGE
+#define OSGPRESENTATION_IMAGE 1
+
+#include <osgPresentation/Element>
+
+namespace osgPresentation {
+
+/** osgPresentation::Image
+*/
+class OSGPRESENTATION_EXPORT Image : public osgPresentation::Element
+{
+    public :
+
+        Image() {}
+
+        /** Copy constructor using CopyOp to manage deep vs shallow copy. */
+        Image(const Image& image,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY) : osgPresentation::Element(image,copyop) {}
+
+        META_Node(osgPresentation, Image);
+
+protected :
+
+        virtual ~Image() {}
+};
+
+}
+
+#endif

include/osgPresentation/Layer

@@ -18,7 +18,7 @@
 
 namespace osgPresentation {
 
-/** osgPresentation::Group
+/** osgPresentation::Layer
 */
 class OSGPRESENTATION_EXPORT Layer : public osgPresentation::Group
 {

include/osgPresentation/Model

@@ -0,0 +1,41 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
+ *
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * OpenSceneGraph Public License for more details.
+*/
+
+#ifndef OSGPRESENTATION_MODEL
+#define OSGPRESENTATION_MODEL 1
+
+#include <osgPresentation/Element>
+
+namespace osgPresentation {
+
+/** osgPresentation::Model
+*/
+class OSGPRESENTATION_EXPORT Model : public osgPresentation::Element
+{
+    public :
+
+        Model() {}
+
+        /** Copy constructor using CopyOp to manage deep vs shallow copy. */
+        Model(const Model& model,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY) : osgPresentation::Element(model,copyop) {}
+
+        META_Node(osgPresentation, Model);
+
+protected :
+
+        virtual ~Model() {}
+};
+
+}
+
+#endif

include/osgPresentation/Movie

@@ -0,0 +1,41 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
+ *
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * OpenSceneGraph Public License for more details.
+*/
+
+#ifndef OSGPRESENTATION_MOVIE
+#define OSGPRESENTATION_MOVIE 1
+
+#include <osgPresentation/Element>
+
+namespace osgPresentation {
+
+/** osgPresentation::Movie
+*/
+class OSGPRESENTATION_EXPORT Movie : public osgPresentation::Element
+{
+    public :
+
+        Movie() {}
+
+        /** Copy constructor using CopyOp to manage deep vs shallow copy. */
+        Movie(const Movie& movie,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY) : osgPresentation::Element(movie,copyop) {}
+
+        META_Node(osgPresentation, Movie);
+
+protected :
+
+        virtual ~Movie() {}
+};
+
+}
+
+#endif

include/osgPresentation/Presentation

@@ -18,7 +18,7 @@
 
 namespace osgPresentation {
 
-/** osgPresentation::Group
+/** osgPresentation::Presentation
 */
 class OSGPRESENTATION_EXPORT Presentation : public osgPresentation::Group
 {

include/osgPresentation/Slide

@@ -18,7 +18,7 @@
 
 namespace osgPresentation {
 
-/** osgPresentation::Group
+/** osgPresentation::Slide
 */
 class OSGPRESENTATION_EXPORT Slide : public osgPresentation::Group
 {

include/osgPresentation/Text

@@ -0,0 +1,41 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
+ *
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * OpenSceneGraph Public License for more details.
+*/
+
+#ifndef OSGPRESENTATION_TEXT
+#define OSGPRESENTATION_TEXT 1
+
+#include <osgPresentation/Element>
+
+namespace osgPresentation {
+
+/** osgPresentation::Text
+*/
+class OSGPRESENTATION_EXPORT Text : public osgPresentation::Element
+{
+    public :
+
+        Text() {}
+
+        /** Copy constructor using CopyOp to manage deep vs shallow copy. */
+        Text(const Text& text,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY) : osgPresentation::Element(text,copyop) {}
+
+        META_Node(osgPresentation, Text);
+
+protected :
+
+        virtual ~Text() {}
+};
+
+}
+
+#endif

include/osgPresentation/Volume

@@ -0,0 +1,41 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
+ *
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * OpenSceneGraph Public License for more details.
+*/
+
+#ifndef OSGPRESENTATION_VOLUME
+#define OSGPRESENTATION_VOLUME 1
+
+#include <osgPresentation/Element>
+
+namespace osgPresentation {
+
+/** osgPresentation::Volume
+*/
+class OSGPRESENTATION_EXPORT Volume : public osgPresentation::Element
+{
+    public :
+
+        Volume() {}
+
+        /** Copy constructor using CopyOp to manage deep vs shallow copy. */
+        Volume(const Volume& volume,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY) : osgPresentation::Element(volume,copyop) {}
+
+        META_Node(osgPresentation, Volume);
+
+protected :
+
+        virtual ~Volume() {}
+};
+
+}
+
+#endif

src/osgPresentation/CMakeLists.txt

@@ -10,12 +10,20 @@ SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
 SET(TARGET_H
     ${HEADER_PATH}/Export
     ${HEADER_PATH}/Cursor
+    ${HEADER_PATH}/Group
+
     ${HEADER_PATH}/Presentation
     ${HEADER_PATH}/Section
     ${HEADER_PATH}/Slide
     ${HEADER_PATH}/Layer
+
     ${HEADER_PATH}/Element
-    ${HEADER_PATH}/Group
+    ${HEADER_PATH}/Text
+    ${HEADER_PATH}/Model
+    ${HEADER_PATH}/Volume
+    ${HEADER_PATH}/Image
+    ${HEADER_PATH}/Movie
+    ${HEADER_PATH}/Audio
 
     ${HEADER_PATH}/deprecated/AnimationMaterial
     ${HEADER_PATH}/deprecated/CompileSlideCallback
@@ -30,7 +38,7 @@ SET(TARGET_H
 # FIXME: For OS X, need flag for Framework or dylib
 SET(TARGET_SRC
     Cursor.cpp
-    
+
     deprecated/AnimationMaterial.cpp
     deprecated/CompileSlideCallback.cpp
     deprecated/PickEventHandler.cpp

src/osgWrappers/serializers/osgPresentation/Audio.cpp

@@ -0,0 +1,11 @@
+#include <osgPresentation/Audio>
+#include <osgDB/ObjectWrapper>
+#include <osgDB/InputStream>
+#include <osgDB/OutputStream>
+
+REGISTER_OBJECT_WRAPPER( osgPresentation_Audio,
+                         new osgPresentation::Audio,
+                         osgPresentation::Audio,
+                         "osg::Object osg::Node osg::Group osg::Transform osg::MatrixTransform osgPresentation::Group osgPresentation::Element osgPresentation::Audio" )
+{
+}

src/osgWrappers/serializers/osgPresentation/Image.cpp

@@ -0,0 +1,11 @@
+#include <osgPresentation/Image>
+#include <osgDB/ObjectWrapper>
+#include <osgDB/InputStream>
+#include <osgDB/OutputStream>
+
+REGISTER_OBJECT_WRAPPER( osgPresentation_Image,
+                         new osgPresentation::Image,
+                         osgPresentation::Image,
+                         "osg::Object osg::Node osg::Group osg::Transform osg::MatrixTransform osgPresentation::Group osgPresentation::Element osgPresentation::Image" )
+{
+}

src/osgWrappers/serializers/osgPresentation/Model.cpp

@@ -0,0 +1,11 @@
+#include <osgPresentation/Model>
+#include <osgDB/ObjectWrapper>
+#include <osgDB/InputStream>
+#include <osgDB/OutputStream>
+
+REGISTER_OBJECT_WRAPPER( osgPresentation_Model,
+                         new osgPresentation::Model,
+                         osgPresentation::Model,
+                         "osg::Object osg::Node osg::Group osg::Transform osg::MatrixTransform osgPresentation::Group osgPresentation::Element osgPresentation::Model" )
+{
+}

src/osgWrappers/serializers/osgPresentation/Movie.cpp

@@ -0,0 +1,11 @@
+#include <osgPresentation/Movie>
+#include <osgDB/ObjectWrapper>
+#include <osgDB/InputStream>
+#include <osgDB/OutputStream>
+
+REGISTER_OBJECT_WRAPPER( osgPresentation_Movie,
+                         new osgPresentation::Movie,
+                         osgPresentation::Movie,
+                         "osg::Object osg::Node osg::Group osg::Transform osg::MatrixTransform osgPresentation::Group osgPresentation::Element osgPresentation::Movie" )
+{
+}

src/osgWrappers/serializers/osgPresentation/Text.cpp

@@ -0,0 +1,11 @@
+#include <osgPresentation/Text>
+#include <osgDB/ObjectWrapper>
+#include <osgDB/InputStream>
+#include <osgDB/OutputStream>
+
+REGISTER_OBJECT_WRAPPER( osgPresentation_Text,
+                         new osgPresentation::Text,
+                         osgPresentation::Text,
+                         "osg::Object osg::Node osg::Group osg::Transform osg::MatrixTransform osgPresentation::Group osgPresentation::Element osgPresentation::Text" )
+{
+}

src/osgWrappers/serializers/osgPresentation/Volume.cpp

@@ -0,0 +1,11 @@
+#include <osgPresentation/Volume>
+#include <osgDB/ObjectWrapper>
+#include <osgDB/InputStream>
+#include <osgDB/OutputStream>
+
+REGISTER_OBJECT_WRAPPER( osgPresentation_Volume,
+                         new osgPresentation::Volume,
+                         osgPresentation::Volume,
+                         "osg::Object osg::Node osg::Group osg::Transform osg::MatrixTransform osgPresentation::Group osgPresentation::Element osgPresentation::Volume" )
+{
+}