From 0ee0aad0fe0dd8fbb4fd6252bffa70a25ec468a8 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 23 Nov 2010 17:33:43 +0000
Subject: [PATCH] Moved TextNode from osgText into example/osgtext3D in prep
 for 3.0

---
 examples/osgtext3D/CMakeLists.txt                         | 5 +++++
 {src/osgText => examples/osgtext3D}/TextNode.cpp          | 4 ++--
 include/osgText/TextNode => examples/osgtext3D/TextNode.h | 0
 examples/osgtext3D/osgtext3D.cpp                          | 3 ++-
 src/osgText/CMakeLists.txt                                | 2 --
 src/osgText/Glyph.cpp                                     | 1 +
 src/osgText/GlyphGeometry.h                               | 2 +-
 7 files changed, 11 insertions(+), 6 deletions(-)
 rename {src/osgText => examples/osgtext3D}/TextNode.cpp (99%)
 rename include/osgText/TextNode => examples/osgtext3D/TextNode.h (100%)

diff --git a/examples/osgtext3D/CMakeLists.txt b/examples/osgtext3D/CMakeLists.txt
index af2e8e9dc..d094c7e5b 100644
--- a/examples/osgtext3D/CMakeLists.txt
+++ b/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)
diff --git a/src/osgText/TextNode.cpp b/examples/osgtext3D/TextNode.cpp
similarity index 99%
rename from src/osgText/TextNode.cpp
rename to examples/osgtext3D/TextNode.cpp
index d3d013e2f..913d9da16 100644
--- a/src/osgText/TextNode.cpp
+++ b/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>
diff --git a/include/osgText/TextNode b/examples/osgtext3D/TextNode.h
similarity index 100%
rename from include/osgText/TextNode
rename to examples/osgtext3D/TextNode.h
diff --git a/examples/osgtext3D/osgtext3D.cpp b/examples/osgtext3D/osgtext3D.cpp
index 3f8bad7e3..661e4b72a 100644
--- a/examples/osgtext3D/osgtext3D.cpp
+++ b/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**);
 
diff --git a/src/osgText/CMakeLists.txt b/src/osgText/CMakeLists.txt
index abe4f2c48..8ff75f23c 100644
--- a/src/osgText/CMakeLists.txt
+++ b/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}
diff --git a/src/osgText/Glyph.cpp b/src/osgText/Glyph.cpp
index 54120f3aa..45602c874 100644
--- a/src/osgText/Glyph.cpp
+++ b/src/osgText/Glyph.cpp
@@ -21,6 +21,7 @@
 #include <osgUtil/SmoothingVisitor>
 
 #include <string.h>
+#include <stdlib.h>
 
 #include "GlyphGeometry.h"
 
diff --git a/src/osgText/GlyphGeometry.h b/src/osgText/GlyphGeometry.h
index 0a06ee5b6..455e42a8d 100644
--- a/src/osgText/GlyphGeometry.h
+++ b/src/osgText/GlyphGeometry.h
@@ -14,7 +14,7 @@
 #ifndef OSGTEXT_GLYPHGEOMETRY
 #define OSGTEXT_GLYPHGEOMETRY 1
 
-#include <osgText/TextNode>
+#include <osgText/Text3D>
 
 namespace osgText
 {