From eb46608be49ccdef55a297c3260138caba230c90 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 27 Feb 2008 12:11:02 +0000
Subject: [PATCH] From Wojciech Lewandowski and Robert Osfield, Support from
 LightPointNode::s/getPointSprite parameter.

---
 src/osgPlugins/ive/IveVersion.h             |  3 ++-
 src/osgPlugins/ive/LightPointNode.cpp       | 10 ++++++++++
 src/osgPlugins/osgSim/IO_LightPointNode.cpp | 18 ++++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/osgPlugins/ive/IveVersion.h b/src/osgPlugins/ive/IveVersion.h
index 8100157c6..4f571538d 100644
--- a/src/osgPlugins/ive/IveVersion.h
+++ b/src/osgPlugins/ive/IveVersion.h
@@ -32,8 +32,9 @@
 #define VERSION_0021 21
 #define VERSION_0022 22
 #define VERSION_0023 23
+#define VERSION_0024 24
 
-#define VERSION VERSION_0023
+#define VERSION VERSION_0024
 
 /* The BYTE_SEX tag is used to check the endian
    of the IVE file being read in.  The IVE format
diff --git a/src/osgPlugins/ive/LightPointNode.cpp b/src/osgPlugins/ive/LightPointNode.cpp
index 6987f3c3e..e98213f0b 100644
--- a/src/osgPlugins/ive/LightPointNode.cpp
+++ b/src/osgPlugins/ive/LightPointNode.cpp
@@ -34,6 +34,11 @@ void LightPointNode::write(DataOutputStream* out){
     out->writeFloat(getMaxPixelSize());
     out->writeFloat(getMaxVisibleDistance2());
 
+    if (out->getVersion() >= VERSION_0024)
+    {
+        out->writeBool(getPointSprite());
+    }
+
     // Write out LightPoints.
     unsigned int size = getNumLightPoints();
     out->writeUInt(size);
@@ -60,6 +65,11 @@ void LightPointNode::read(DataInputStream* in){
         setMaxPixelSize(in->readFloat());
         setMaxVisibleDistance2(in->readFloat());
 
+        if (in->getVersion() >= VERSION_0024)
+        {
+            setPointSprite(in->readBool());
+        }
+        
         // Read in lightpoints.
         unsigned int size = in->readUInt();
         for(unsigned int i=0; i<size; i++ ){
diff --git a/src/osgPlugins/osgSim/IO_LightPointNode.cpp b/src/osgPlugins/osgSim/IO_LightPointNode.cpp
index 119c719e6..0677b605b 100644
--- a/src/osgPlugins/osgSim/IO_LightPointNode.cpp
+++ b/src/osgPlugins/osgSim/IO_LightPointNode.cpp
@@ -64,6 +64,22 @@ bool LightPointNode_readLocalData(osg::Object &obj, osgDB::Input &fr)
         itAdvanced = true;
     }
 
+    if (fr[0].matchWord("pointSprite"))
+    {
+        if (fr[1].matchWord("FALSE"))
+        {
+            lightpointnode.setPointSprite(false);
+            fr+=2;
+            itAdvanced = true;
+        }
+        else if (fr[1].matchWord("TRUE"))
+        {
+            lightpointnode.setPointSprite(true);
+            fr+=2;
+            itAdvanced = true;
+        }
+    }
+
     if (fr[0].matchWord("lightPoint")) {
         LightPoint lp;
         if (readLightPoint(lp, fr)) {
@@ -87,6 +103,8 @@ bool LightPointNode_writeLocalData(const osg::Object &obj, osgDB::Output &fw)
 
     fw.indent() << "maxVisibleDistance2 " << lightpointnode.getMaxVisibleDistance2() << std::endl;
 
+    fw.indent() << "pointSprite " << ( lightpointnode.getPointSprite() ? "TRUE" : "FALSE" ) << std::endl;
+
     LightPointNode::LightPointList const lightpointlist = lightpointnode.getLightPointList();
     LightPointNode::LightPointList::const_iterator itr;