From 78fc28be7cf66acb113c0c62f8983880ad3748f4 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Sat, 26 Jan 2002 14:13:27 +0000
Subject: [PATCH] Fixed the LOD center and range code that so that the values
 are now multiple by the _unitScale to compenstate for different scales in the
 flt model.  This _unitScale had already been applied to the geometry data.

Integrated new defaults for the texturing wrap mode, for when now .attr file
is supplied with a flt file.
---
 src/osgPlugins/flt/flt2osg.cpp | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/osgPlugins/flt/flt2osg.cpp b/src/osgPlugins/flt/flt2osg.cpp
index b0816e46a..8dbba598f 100644
--- a/src/osgPlugins/flt/flt2osg.cpp
+++ b/src/osgPlugins/flt/flt2osg.cpp
@@ -453,6 +453,12 @@ osg::Node* ConvertFromFLT::visitTexturePalette(osg::Group* , TexturePaletteRecor
         if (osgStateSet == NULL)
         {
             osgStateSet = new osg::StateSet;
+
+            osg::Texture* osgTexture = new osg::Texture;
+            osgTexture->setWrap(osg::Texture::WRAP_S,osg::Texture::REPEAT);
+            osgTexture->setWrap(osg::Texture::WRAP_T,osg::Texture::REPEAT);
+            osgStateSet->setAttributeAndModes(osgTexture,osg::StateAttribute::ON);
+
             osg::TexEnv* osgTexEnv = new osg::TexEnv;
             osgTexEnv->setMode(osg::TexEnv::MODULATE);
             osgStateSet->setAttribute( osgTexEnv );
@@ -556,9 +562,9 @@ osg::Node* ConvertFromFLT::visitLOD(osg::Group* osgParent, LodRecord* rec)
         visitPrimaryNode(group, (PrimNodeRecord*)rec);
         float64x3* pCenter = &pSLOD->Center;
         lod->addChild(group);
-        lod->setCenter(osg::Vec3(pCenter->x(), pCenter->y(), pCenter->z()));
-        lod->setRange(0, pSLOD->dfSwitchOutDist);
-        lod->setRange(1, pSLOD->dfSwitchInDist);
+        lod->setCenter(osg::Vec3(pCenter->x(), pCenter->y(), pCenter->z())*_unitScale);
+        lod->setRange(0, pSLOD->dfSwitchOutDist*_unitScale);
+        lod->setRange(1, pSLOD->dfSwitchInDist*_unitScale);
         lod->setName(pSLOD->szIdent);
         osgParent->addChild( lod );
     }
@@ -582,9 +588,9 @@ osg::Node* ConvertFromFLT::visitOldLOD(osg::Group* osgParent, OldLodRecord* rec)
         lod->setCenter(osg::Vec3(
             (float)pSLOD->Center[0],
             (float)pSLOD->Center[1],
-            (float)pSLOD->Center[2]));
-        lod->setRange(0, (float)pSLOD->dwSwitchOutDist);
-        lod->setRange(1, (float)pSLOD->dwSwitchInDist);
+            (float)pSLOD->Center[2])*_unitScale);
+        lod->setRange(0, ((float)pSLOD->dwSwitchOutDist)*_unitScale);
+        lod->setRange(1, ((float)pSLOD->dwSwitchInDist)*_unitScale);
         lod->setName(pSLOD->szIdent);
         osgParent->addChild( lod );
     }
@@ -1168,7 +1174,7 @@ osg::Node* ConvertFromFLT::visitMatrix(osg::Group* osgParent, MatrixRecord* rec)
         // scale position.
         // BJ Don't know if this should be done if version > 12
         osg::Vec3 pos = m.getTrans();
-        m *= osg::Matrix::translate(-pos.x(),-pos.y(),-pos.z());
+        m *= osg::Matrix::translate(-pos);
         pos *= (float)_unitScale;
         m *= osg::Matrix::translate(pos);