Merge remote-tracking branch 'upstream/osganimation' into osganimation

CMakeModules/OsgMacroUtils.cmake

@@ -361,7 +361,7 @@ ENDMACRO(SETUP_PLUGIN)
 
 MACRO(SETUP_EXE IS_COMMANDLINE_APP)
     #MESSAGE("in -->SETUP_EXE<-- ${TARGET_NAME}-->${TARGET_SRC} <--> ${TARGET_H}<--")
-    IF(GL3_FOUND)
+    IF(GLCORE_FOUND)
         INCLUDE_DIRECTORIES( ${GLCORE_INCLUDE_DIR} )
     ENDIF()
 

examples/osgemscripten/CMakeLists.txt

@@ -9,8 +9,11 @@ SET(EGL_LIBRARY "GL" CACHE STRING "Suppress linkage error")
 SET(OSG_GL1_AVAILABLE OFF CACHE BOOL "Unavailable under Emscripten")
 SET(OSG_GL2_AVAILABLE OFF CACHE BOOL "Unavailable under Emscripten")
 SET(OSG_GLES2_AVAILABLE ON CACHE BOOL "GLES2 is what Emscripten uses")
+SET(OSG_WINDOWING_SYSTEM "None" CACHE STRING "Unavailable under Emscripten")
 SET(DYNAMIC_OPENTHREADS OFF CACHE BOOL "Link OpenThreads statically")
 SET(DYNAMIC_OPENSCENEGRAPH OFF CACHE BOOL "Link OpenSceneGraph statically")
+# Prevent CMake configuration error.
+SET(_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE "0" CACHE STRING "Prevent cfg error")
 # Reference SDL2 during build process.
 # We use SDL2 to do the following:
 # * OpenGL functions' address retrieval

include/osg/Group

@@ -43,7 +43,7 @@ class OSG_EXPORT Group : public Node
         virtual void traverse(NodeVisitor& nv);
 
         /** Add Node to Group.
-          * If node is not NULL and is not contained in Group then increment its
+          * If node is not NULL then increment its
           * reference count, add it to the child list and dirty the bounding
           * sphere to force it to recompute on next getBound() and return true for success.
           * Otherwise return false. Scene nodes can't be added as child nodes.

include/osg/PrimitiveSetIndirect

@@ -82,7 +82,7 @@ struct DrawArraysIndirectCommand
 
 /// default implementation of IndirectCommandDrawArrays
 /// DefaultIndirectCommandDrawArrays to be hosted on GPU
-class OSG_EXPORT DefaultIndirectCommandDrawArrays: public IndirectCommandDrawArrays, public  MixinVector<DrawArraysIndirectCommand>
+class DefaultIndirectCommandDrawArrays: public IndirectCommandDrawArrays, public  MixinVector<DrawArraysIndirectCommand>
 {
 public:
     META_Object(osg,DefaultIndirectCommandDrawArrays)
@@ -120,7 +120,7 @@ struct DrawElementsIndirectCommand
 };
 
 /// vector of DrawElementsCommand to be hosted on GPU
-class OSG_EXPORT DefaultIndirectCommandDrawElements: public IndirectCommandDrawElements, public MixinVector<DrawElementsIndirectCommand>
+class DefaultIndirectCommandDrawElements: public IndirectCommandDrawElements, public MixinVector<DrawElementsIndirectCommand>
 {
 public:
     META_Object(osg,DefaultIndirectCommandDrawElements)

src/osg/Program.cpp

@@ -633,10 +633,14 @@ Program::PerContextProgram* Program::getPCP(State& state) const
 
 bool Program::isFixedFunction() const
 {
+#ifdef OSG_GL_FIXED_FUNCTION_AVAILABLE
     // A Program object having no attached Shaders is a special case:
     // it indicates that programmable shading is to be disabled,
     // and thus use GL 1.x "fixed functionality" rendering.
     return _shaderList.empty();
+#else
+    return false;
+#endif
 }