Merge branch 'revert-9d1a97ed' into 'master'

Revert "Merge branch '11-feature_osg_shadow_qml_wrapper1' into 'master'"

See merge request energid/osgqtquick!11

src/CMakeLists.txt

@@ -21,7 +21,6 @@ find_package(OpenSceneGraph 3.0 REQUIRED
   osgManipulator
   osgUtil
   osgViewer
-  osgShadow
   osgText)
 
 # osgQt

src/imports/CMakeLists.txt

@@ -4,8 +4,6 @@ add_subdirectory(osgga)
 add_subdirectory(osgmanipulator)
 add_subdirectory(osgtext)
 add_subdirectory(osgviewer)
-add_subdirectory(osgshadow)
-
 
 if(osgQtQuick_WITH_OSGQT)
   add_subdirectory(osgqt)

src/qml/CMakeLists.txt

@@ -82,11 +82,6 @@ META_Node(osgManipulator CompositeDragger)
 META_Node(osgManipulator TabPlaneDragger)
 META_Node(osgManipulator TabBoxDragger)
 
-META_Node(osgShadow ShadowedScene)
-META_Node(osgShadow ShadowTechnique)
-META_Node(osgShadow ShadowMap)
-
-
 META_Node(osgText Style)
 META_Node(osgText Font)
 META_Node(osgText FontImplementation)
@@ -115,7 +110,8 @@ set(_hdrs
   osg/lightsourceindex.hpp
   osg/lightmodelindex.hpp
   osg/stateattributeindex.hpp
-  osg/osgqtconversion.hpp 
+  osg/osgqtconversion.hpp
+
   osgdb/loader.hpp
   osgdb/loaderindex.hpp
   osgga/cameramanipulator.hpp
@@ -152,14 +148,6 @@ list(APPEND _srcs
   osgga/module.cpp
 # osgManipulator
   osgmanipulator/module.cpp
-#osgShadow
-  osgshadow/shadowedscene.cpp
-  osgshadow/shadowedsceneindex.cpp
-  osgshadow/shadowtechnique.cpp
-  osgshadow/shadowtechniqueindex.cpp
-  osgshadow/shadowmap.cpp
-  osgshadow/shadowmapindex.cpp
-  osgshadow/module.cpp
 # osgText
   osgtext/module.cpp
 # osgViewer
@@ -206,7 +194,6 @@ target_link_libraries(osgQtQml
   ${OSGMANIPULATOR_LIBRARIES}
   ${OSGTEXT_LIBRARIES}
   ${OSGVIEWER_LIBRARIES}
-  ${OSGSHADOW_LIBRARIES}
   ${OSGEARTHUTIL_LIBRARY}
   Qt5::Gui
   Qt5::Qml)
@@ -300,17 +287,6 @@ install(FILES "${CMAKE_CURRENT_LIST_DIR}/osgmanipulator/module.hpp"
 install(FILES "${CMAKE_CURRENT_LIST_DIR}/osgmanipulator/module.hpp"
   DESTINATION "include/osgManipulator" RENAME "ModuleQtQml" COMPONENT ${PROJECT_NAME}-src)
 
-file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/include/osgShadow/ModuleQtQml"
-  CONTENT "#include \"${CMAKE_CURRENT_LIST_DIR}/osgShadow/module.hpp\"\n")
-install(FILES "${CMAKE_CURRENT_LIST_DIR}/osgShadow/module.hpp"
-  DESTINATION "include/osgShadow" RENAME "ModuleQtQml")
-install(FILES "${CMAKE_CURRENT_LIST_DIR}/osgShadow/module.hpp"
-  DESTINATION "include/osgShadow" RENAME "ModuleQtQml" COMPONENT ${PROJECT_NAME}-hdr)
-install(FILES "${CMAKE_CURRENT_LIST_DIR}/osgShadow/module.hpp"
-  DESTINATION "include/osgShadow" RENAME "ModuleQtQml" COMPONENT ${PROJECT_NAME}-lib)
-install(FILES "${CMAKE_CURRENT_LIST_DIR}/osgShadow/module.hpp"
-  DESTINATION "include/osgShadow" RENAME "ModuleQtQml" COMPONENT ${PROJECT_NAME}-src)
-
 
 file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/include/osgText/ModuleQtQml"
   CONTENT "#include \"${CMAKE_CURRENT_LIST_DIR}/osgtext/module.hpp\"\n")

src/qml/osg/lightsource.cpp

@@ -51,13 +51,7 @@ void LightSourceQtQml::classBegin
    o(this)->setLocalStateSetModes(m_LocalStateSetModes);
 }
 
-//------------------------------------------------------------------------------
-osg::LightSource* LightSourceQtQml::lightSource
-   (
-   )
-{
-   return o(this);
-}
+
 
 //------------------------------------------------------------------------------
 const QVariant LightSourceQtQml::light
@@ -91,7 +85,7 @@ void LightSourceQtQml::setLight
 }
 
 //------------------------------------------------------------------------------
-const int LightSourceQtQml::localStateSetModes
+const quint16 LightSourceQtQml::localStateSetModes
    (
    )const
 {
@@ -101,7 +95,7 @@ const int LightSourceQtQml::localStateSetModes
 //------------------------------------------------------------------------------
 void LightSourceQtQml::setLocalStateSetModes
    (
-   const int mode
+   const quint16 mode
    )
 {
    if(m_LocalStateSetModes == mode)
@@ -115,11 +109,4 @@ void LightSourceQtQml::setLocalStateSetModes
 
 }
 
-
-//------------------------------------------------------------------------------
-void LightSourceQtQml:: setStateSetModes(StateSetQtQml* stateSet, int mode)
-{
-   o(this)->setStateSetModes(*stateSet->stateSet(), mode);
-}
-
 }

src/qml/osg/lightsource.hpp

@@ -20,7 +20,6 @@
 namespace osg {
 
 class LightQtQml;
-class LightSource;
 
 ///
 /// \brief The LightSourceQtQml class wraps the osg::LightSource item/class provided by the
@@ -43,7 +42,7 @@ class OSGQTQML_EXPORT LightSourceQtQml :
    /// \property localStateSetModes for the Light Source.
    ///
    /// \details
-   Q_PROPERTY(int localStateSetModes READ localStateSetModes WRITE setLocalStateSetModes NOTIFY localStateSetModesChanged)
+   Q_PROPERTY(quint16 localStateSetModes READ localStateSetModes WRITE setLocalStateSetModes NOTIFY localStateSetModesChanged)
 
 
 public:
@@ -73,10 +72,6 @@ class OSGQTQML_EXPORT LightSourceQtQml :
       QObject *parent = 0
       );
 
-   osg::LightSource* lightSource
-      (
-      );
-
    ///
    /// \brief light Getter for light property
    /// \return  value
@@ -89,13 +84,11 @@ class OSGQTQML_EXPORT LightSourceQtQml :
    /// \brief localStateSetModes Getter for localStateSetModes property
    /// \return  value
    ///
-   const int localStateSetModes
+   const quint16 localStateSetModes
       (
       ) const;
 
 
-   Q_INVOKABLE void setStateSetModes(StateSetQtQml* stateSet, int mode);
-
 
 public Q_SLOTS:
    ///
@@ -113,7 +106,7 @@ public Q_SLOTS:
    ///
    void setLocalStateSetModes
       (
-      const int mode
+      const quint16 mode
       );
 
 
@@ -133,14 +126,14 @@ public Q_SLOTS:
    ///
    void localStateSetModesChanged
       (
-      const int mode
+      const quint16 mode
       );
 
 
 protected:
 
    osg::LightQtQml*   m_pLightObject;
-   int       m_LocalStateSetModes;
+   quint16       m_LocalStateSetModes;
 
 };
 

src/qml/osg/module.cpp

@@ -20,9 +20,6 @@
 #include "cylinderindex.hpp"
 #include "geodeindex.hpp"
 
-#include "light.hpp"
-#include "lightsource.hpp"
-
 #include <osg/Group>
 
 #include <osgQtQml/Object>
@@ -108,14 +105,6 @@ void registerQtQmlTypes(const char *uri)
                 uri, osgQtQuick_VERSION_MAJOR, osgQtQuick_VERSION_MINOR,
                 "Cylinder");
 
-    qmlRegisterType<LightQtQml>(
-                uri, osgQtQuick_VERSION_MAJOR, osgQtQuick_VERSION_MINOR,
-                "Light");
-
-    qmlRegisterType<LightSourceQtQml>(
-                uri, osgQtQuick_VERSION_MAJOR, osgQtQuick_VERSION_MINOR,
-                "LightSource");
-
     osgQtQml::Index::insertMake(&qtMakeIndex);
     osgQtQml::Index::insertMake(&osgMakeIndex);
 }

src/qml/osg/osgqtconversion.hpp

@@ -11,10 +11,8 @@
 
 #include <QtCore/qglobal.h>
 #include <osg/Vec4>
-#include <osg/Vec2d>
 #include <osg/Vec3d>
 #include <QtGui/QColor>
-#include <QtGui/QVector2D>
 #include <QtGui/QVector3D>
 #include <QtGui/QVector4D>
 //#include <boost/numeric/conversion/cast.hpp>
@@ -62,19 +60,6 @@ namespace OsgQtConversion
       return osg::Vec4(vect[0], vect[1], vect[2], vect[3]);
    }
 
-   ///
-   /// \brief toOsg Converts a vector of QVector4D to equivalent osg vect3d  value
-   /// \param vector QVector4D value.
-   /// \return osg::Vec3d value.
-   ///
-   inline /*OSGQTQML_EXPORT*/ osg::Vec2d toOsg
-      (
-      const QVector2D &vect
-      )
-   {
-      return osg::Vec2d(vect[0], vect[1]);
-   }
-
    ///
    /// \brief toOsg Converts a vector of QVector3D to equivalent osg vect3d  value
    /// \param vector QVector3D value.
@@ -124,15 +109,6 @@ namespace OsgQtConversion
    {
       return QVector4D(vect.x(), vect.y(), vect.z(), vect.w());
    }
-
-   /// \brief Returns a QVector4D by value for given osg::Vec4.
-   inline /*OSGQTQML_EXPORT*/ QVector2D toQt
-      (
-      const osg::Vec2d& vect
-      )
-   {
-      return QVector2D(vect.x(), vect.y());
-   }
 }
 
 #endif // OSGQTCONVERSION_H