Moved TextNode from osgText into example/osgtext3D in prep for 3.0

examples/osgtext3D/CMakeLists.txt

@@ -1,9 +1,14 @@
 SET(TARGET_SRC
+    TextNode.cpp
     osgtext3D_orig.cpp
     osgtext3D_test.cpp
     osgtext3D.cpp
 )
 
+SET(TARGET_H
+    TextNode.h
+)
+
 SET(TARGET_ADDED_LIBRARIES osgText )
 #### end var setup  ###
 SETUP_EXAMPLE(osgtext3D)

examples/osgtext3D/TextNode.cpp

@@ -11,8 +11,8 @@
  * OpenSceneGraph Public License for more details.
 */
 
-#include <osgText/TextNode>
-#include "GlyphGeometry.h"
+#include "TextNode.h"
+#include "../../src/osgText/GlyphGeometry.h"
 
 #include <osg/PositionAttitudeTransform>
 #include <osg/Geode>

examples/osgtext3D/osgtext3D.cpp

@@ -30,9 +30,10 @@
 #include <osgViewer/ViewerEventHandlers>
 #include <osg/io_utils>
 
-#include <osgText/TextNode>
 #include <osgText/Text3D>
 
+#include "TextNode.h"
+
 extern int main_orig(int, char**);
 extern int main_test(int, char**);
 

src/osgText/CMakeLists.txt

@@ -18,7 +18,6 @@ SET(LIB_PUBLIC_HEADERS
     ${HEADER_PATH}/Style
     ${HEADER_PATH}/TextBase
     ${HEADER_PATH}/Text
-    ${HEADER_PATH}/TextNode
     ${HEADER_PATH}/Text3D
     ${HEADER_PATH}/Version
 )
@@ -38,7 +37,6 @@ ADD_LIBRARY(${LIB_NAME}
     Style.cpp
     TextBase.cpp
     Text.cpp
-    TextNode.cpp
     Text3D.cpp
     Version.cpp
     ${OPENSCENEGRAPH_VERSIONINFO_RC}

src/osgText/Glyph.cpp

@@ -21,6 +21,7 @@
 #include <osgUtil/SmoothingVisitor>
 
 #include <string.h>
+#include <stdlib.h>
 
 #include "GlyphGeometry.h"
 

src/osgText/GlyphGeometry.h

@@ -14,7 +14,7 @@
 #ifndef OSGTEXT_GLYPHGEOMETRY
 #define OSGTEXT_GLYPHGEOMETRY 1
 
-#include <osgText/TextNode>
+#include <osgText/Text3D>
 
 namespace osgText
 {